X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=point_of_sale.py;h=dcfb14e78f251b380e2aaab1373a77bd0f41761f;hb=97364ec4c4bc7aa053389ac2e53151375ef827a1;hp=70f7c3fcce9072b0a38a37606624d1641a7b1053;hpb=72fe25042c12a865510836739a83b7ab68c336c9;p=burette%2Fnrt_point_of_sale.git

diff --git a/point_of_sale.py b/point_of_sale.py
index 70f7c3f..dcfb14e 100644
--- a/point_of_sale.py
+++ b/point_of_sale.py
@@ -64,7 +64,10 @@ class pos_session(orm.Model):
         for session in self.browse(cr, uid, ids, context=context):
             account_move_ids = []
             order_ids = [order.id for order in session.order_ids if order.state == 'done']
-            company_id = order_obj.browse(cr, uid, order_ids, context=context)[0].company_id.id
+            if order_ids:
+                company_id = order_obj.browse(cr, uid, order_ids, context=context)[0].company_id.id
+            else:
+                company_id = self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id
             for order in order_obj.browse(cr, uid, order_ids, context=context):
                 if order.account_move.id not in account_move_ids:
                     account_move_ids.append(order.account_move.id)
@@ -75,15 +78,12 @@ class pos_session(orm.Model):
 
     def wkf_action_closing_control(self, cr, uid, ids, context=None):
         """
-        Disable default start_at date
-        Piece of this code was copied from
-        addons/point_of_sale/point_of_sale.py:397
+        Put same stop_at date in pos_session as its start_at date
         """
+        res = super(pos_session, self).wkf_action_closing_control(cr, uid, ids, context=context)
         for session in self.browse(cr, uid, ids, context=context):
-            for statement in session.statement_ids:
-                if (statement != session.cash_register_id) and (statement.balance_end != statement.balance_end_real):
-                    self.pool.get('account.bank.statement').write(cr, uid, [statement.id], {'balance_end_real': statement.balance_end})
-        return True
+            self.write(cr, uid, [session.id], {'stop_at': session.start_at}, context=context)
+        return res
 
     def onchange_start_at(self, cr, uid, ids, start_at, context=None):
         """Define same stop_at as start_at"""