From e9ee8121655e88e00639ce760d2b4b39e2ef9709 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 7 Dec 2008 03:24:43 +0100 Subject: [PATCH] improve bzr revid: fp@tinyerp.com-20081207022443-wb8b31izgky1elpa --- addons/account_tax_include/invoice_tax_incl.py | 4 ++-- addons/membership/membership.py | 2 +- addons/mrp_operations/mrp_operations.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/invoice_tax_incl.py index be2c1e37a27..eee35f75676 100644 --- a/addons/account_tax_include/invoice_tax_incl.py +++ b/addons/account_tax_include/invoice_tax_incl.py @@ -107,9 +107,9 @@ class account_invoice_line(osv.osv): return result.keys() _columns = { 'price_subtotal': fields.function(_amount_line2, method=True, string='Subtotal w/o tax', multi='amount', - store={'account.invoice':(_get_invoice,None), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None)}), + store={'account.invoice':(_get_invoice,['price_type']), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None)}), 'price_subtotal_incl': fields.function(_amount_line2, method=True, string='Subtotal', multi='amount', - store={'account.invoice':(_get_invoice,None), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None)}), + store={'account.invoice':(_get_invoice,['price_type']), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None)}), } _defaults = { diff --git a/addons/membership/membership.py b/addons/membership/membership.py index ca096a0045f..4c47a5f9187 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -437,7 +437,7 @@ class Partner(osv.osv): # 'membership_state': fields.function(_membership_state, method=True, string='Current membership state', # type='selection', selection=STATE, fnct_search=_membership_state_search), 'membership_state': fields.function(_membership_state, method=True, string='Current membership state', - type='selection',selection=STATE,store={'account.invoice':(['state'],_membership_state_search_inv)}), + type='selection',selection=STATE,store={'account.invoice':(_membership_state_search_inv,['state'])}), # 'associate_member': fields.many2one('res.partner', 'Associate member'), 'free_member': fields.boolean('Free member'), 'membership_start': fields.function(_membership_start, method=True, diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index 789236def0b..26c96f32d43 100755 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -294,7 +294,7 @@ class mrp_operations_operation(osv.osv): 'code_id':fields.many2one('mrp_operations.operation.code','Code',required=True), 'date_start': fields.datetime('Start Date'), 'date_finished': fields.datetime('End Date'), - 'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(['date_planned'],_order_date_search_production)}), + 'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(_order_date_search_production,['date_planned'])}), } _defaults={ 'date_start': lambda *a:DateTime.now().strftime('%Y-%m-%d %H:%M:%S')