Hiral Patel (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-1104099-hip into lp:openobject-addons.
Requested reviews: OpenERP Core Team (openerp) Related bugs: Bug #1104099 in OpenERP Addons: "POS payment wrong date" https://bugs.launchpad.net/openobject-addons/+bug/1104099 For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1104099-hip/+merge/145355 -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1104099-hip/+merge/145355 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-1104099-hip.
=== modified file 'point_of_sale/point_of_sale.py' --- point_of_sale/point_of_sale.py 2012-12-06 14:56:32 +0000 +++ point_of_sale/point_of_sale.py 2013-01-29 12:27:28 +0000 @@ -514,7 +514,7 @@ cash_journal = cash_journal_ids[0].journal_id self.add_payment(cr, uid, order_id, { 'amount': -order['amount_return'], - 'payment_date': time.strftime('%Y-%m-%d %H:%M:%S'), + 'payment_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 'payment_name': _('return'), 'journal': cash_journal.id, }, context=context) === modified file 'point_of_sale/wizard/pos_payment.py' --- point_of_sale/wizard/pos_payment.py 2012-12-06 14:56:32 +0000 +++ point_of_sale/wizard/pos_payment.py 2013-01-29 12:27:28 +0000 @@ -126,7 +126,7 @@ } _defaults = { 'journal_id' : _default_journal, - 'payment_date': time.strftime('%Y-%m-%d %H:%M:%S'), + 'payment_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 'amount': _default_amount, }
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : openerp-dev-gtk@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp