odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] payment, reference not required 

bzr revid: fp@tinyerp.com-20110926073846-wzaetyo8pmvuwhp4
This commit is contained in:
Fabien Pinckaers 2011-09-26 09:38:46 +02:00
parent d1e40a55af
commit 9633196fdc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/point_of_sale/point_of_sale.py
View File

@ -255,8 +255,9 @@ class pos_order(osv.osv):
}
if 'payment_date' in data.keys():
args['date'] = data['payment_date']
if 'payment_name' in data.keys():
args['name'] = data['payment_name'] + ' ' + order.name
args['name'] = order.name
if data.get('payment_name', False):
args['name'] = args['name'] + ': ' + data['payment_name']
account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
args['account_id'] = order.partner_id and order.partner_id.property_account_receivable \
and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id

3
addons/point_of_sale/wizard/pos_payment.py
View File

@ -90,12 +90,11 @@ class pos_make_payment(osv.osv_memory):
_columns = {
'journal': fields.selection(pos_box_entries.get_journal, "Payment Mode", required=True),
'amount': fields.float('Amount', digits=(16,2), required= True),
'payment_name': fields.char('Payment Reference', size=32, required=True),
'payment_name': fields.char('Payment Reference', size=32),
'payment_date': fields.date('Payment Date', required=True),
}
_defaults = {
'payment_date': time.strftime('%Y-%m-%d %H:%M:%S'),
'payment_name': _('Payment'),
'amount': _default_amount,
'journal': _default_journal
}