Merge lp:~openerp-dev/openobject-addons/trunk-bug-1104099-hip into lp:openobject-addons

[Hiral Patel (OpenERP)]

Unmerged revisions

8523. By Hiral Patel (OpenERP) on 2013-01-29

[trunk][FIX] POS payment wrong date

=== 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,
     }