[FIX] Account_date_check/point_of_sale : Corrections in check_date constraint of...

lp bug: https://launchpad.net/bugs/604542 fixed

bzr revid: jvo@tinyerp.com-20100712125927-9t4dzlh1z27hlkj8

diff --git a/addons/account_date_check/account_date_check.py b/addons/account_date_check/account_date_check.py
index be7f02c..d3c1f0e 100644 (file)
--- a/addons/account_date_check/account_date_check.py
+++ b/addons/account_date_check/account_date_check.py
@@ -61,11 +61,11 @@ class account_move_line(osv.osv):
             else:
                 journal_id = context['journal_id']
                 period_id = context['period_id']
-            journal=self.pool.get('account.journal').browse(cr,uid,[journal_id])[0]
+            journal = self.pool.get('account.journal').browse(cr,uid,[journal_id])[0]
             if not journal.allow_date:
                 period=self.pool.get('account.period').browse(cr,uid,[period_id])[0]
 
-                date = time.strptime(vals['date'], '%Y-%m-%d')
+                date = time.strptime(vals['date'][:10], '%Y-%m-%d')
                 if not (date >= time.strptime(period.date_start,'%Y-%m-%d')
                         and date <= time.strptime(period.date_stop,'%Y-%m-%d') ):
 

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index ece7221..d03b394 100644 (file)
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -630,7 +630,7 @@ class pos_order(osv.osv):
                 # Create a move for the line
                 account_move_line_obj.create(cr, uid, {
                     'name': order.name,
-                    'date': order.date_order,
+                    'date': order.date_order[:10],
                     'ref': order.name,
                     'move_id': move_id,
                     'account_id': income_account,
@@ -656,7 +656,7 @@ class pos_order(osv.osv):
 
                     account_move_line_obj.create(cr, uid, {
                         'name': order.name,
-                        'date': order.date_order,
+                        'date': order.date_order[:10],
                         'ref': order.name,
                         'move_id': move_id,
                         'account_id': income_account,
@@ -675,7 +675,7 @@ class pos_order(osv.osv):
             for key, amount in group_tax.items():
                 account_move_line_obj.create(cr, uid, {
                     'name': order.name,
-                    'date': order.date_order,
+                    'date': order.date_order[:10],
                     'ref': order.name,
                     'move_id': move_id,
                     'account_id': key[account_pos],
@@ -691,7 +691,7 @@ class pos_order(osv.osv):
             # counterpart
             to_reconcile.append(account_move_line_obj.create(cr, uid, {
                 'name': order.name,
-                'date': order.date_order,
+                'date': order.date_order[:10],
                 'ref': order.name,
                 'move_id': move_id,
                 'account_id': order_account,
@@ -740,7 +740,7 @@ class pos_order(osv.osv):
                 }, context=context)
                 account_move_line_obj.create(cr, uid, {
                     'name': order.name,
-                    'date': order.date_order,
+                    'date': order.date_order[:10],
                     'ref': order.name,
                     'move_id': payment_move_id,
                     'account_id': payment_account,
@@ -752,7 +752,7 @@ class pos_order(osv.osv):
                 }, context=context)
                 to_reconcile.append(account_move_line_obj.create(cr, uid, {
                     'name': order.name,
-                    'date': order.date_order,
+                    'date': order.date_order[:10],
                     'ref': order.name,
                     'move_id': payment_move_id,
                     'account_id': order_account,