From 9633196fdcbb8148f757ed81eaf784b067796de9 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 26 Sep 2011 09:38:46 +0200 Subject: [PATCH] [IMP] payment, reference not required bzr revid: fp@tinyerp.com-20110926073846-wzaetyo8pmvuwhp4 --- addons/point_of_sale/point_of_sale.py | 5 +++-- addons/point_of_sale/wizard/pos_payment.py | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index e6e06afdc89..19f18d92dd6 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -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 diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py index 1de3a23614a..adf59e3cbce 100644 --- a/addons/point_of_sale/wizard/pos_payment.py +++ b/addons/point_of_sale/wizard/pos_payment.py @@ -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 }