bzr revid: fp@tinyerp.com-20081207022443-wb8b31izgky1elpa
This commit is contained in:
Fabien Pinckaers
2008-12-07 03:24:43 +01:00
parent c05803cd7c
commit e9ee812165
3 changed files with 4 additions and 4 deletions
@@ -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 = {
+1 -1
View File
@@ -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,
+1 -1
View File
@@ -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')