diff options
| author | uco (Open ERP) <uco@tinyerp.com> | 2010-09-29 17:42:12 +0530 |
|---|---|---|
| committer | uco (Open ERP) <uco@tinyerp.com> | 2010-09-29 17:42:12 +0530 |
| commit | f1abdb085e21cadc207b8aaba29f4e2f0fc253d2 (patch) | |
| tree | 9f66e1a929e11111dd7651bdbf9134bd43c3eec8 | |
| parent | ce6a497937078b7de9b3ff011f9add94370abe2e (diff) | |
[FIX] mrp_operations: Scheduled date error corrected.
[REM] point_of_sale: Removed remaining unused variable.
bzr revid: uco@tinyerp.com-20100929121212-e14ej6jeq1eyvp88
| -rw-r--r-- | addons/mrp_operations/mrp_operations.py | 4 | ||||
| -rw-r--r-- | addons/point_of_sale/pos.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index 919f65903ae..e0c335f4f7c 100644 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -257,7 +257,7 @@ class mrp_production(osv.osv): """ dt_end = DateTime.now() for po in self.browse(cr, uid, ids, context=context): - dt_end = DateTime.strptime(po.date_start or po.date_planned, '%Y-%m-%d %H:%M:%S') + dt_end = DateTime.strptime(po.date_planned, '%Y-%m-%d %H:%M:%S') if not po.date_start: self.write(cr, uid, [po.id], { 'date_start': po.date_planned @@ -271,7 +271,7 @@ class mrp_production(osv.osv): del context['__last_update'] if (wc.date_planned < dt.strftime('%Y-%m-%d %H:%M:%S')) or mini: self.pool.get('mrp.production.workcenter.line').write(cr, uid, [wc.id], { - 'date_planned':dt.strftime('%Y-%m-%d %H:%M:%S') + 'date_planned': dt.strftime('%Y-%m-%d %H:%M:%S') }, context=context, update=False) i = self.pool.get('resource.calendar').interval_get( cr, diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py index 49e2df2199f..80363f719fd 100644 --- a/addons/point_of_sale/pos.py +++ b/addons/point_of_sale/pos.py @@ -999,7 +999,7 @@ class pos_order_line(osv.osv): def _amount_line_ttc(self, cr, uid, ids, field_name, arg, context): res = dict.fromkeys(ids, 0.0) account_tax_obj = self.pool.get('account.tax') - prices = self.price_by_product_multi(cr, uid, ids) + self.price_by_product_multi(cr, uid, ids) for line in self.browse(cr, uid, ids): tax_amount = 0.0 taxes = [t for t in line.product_id.taxes_id] @@ -1008,7 +1008,6 @@ class pos_order_line(osv.osv): computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes'] for tax in computed_taxes: tax_amount += tax['amount'] - price = prices[line.id] if line.discount!=0.0: res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0) else: |