From 85f6cb82390714e86b7b82e81afc0fee798eb7b6 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 4 Feb 2013 12:11:42 +0530
Subject: [PATCH] [IMP] POS: made some changes in code

bzr revid: cha@tinyerp.com-20130204064142-xivaomscssibwsb8
---
 addons/point_of_sale/point_of_sale.py      | 4 ++--
 addons/point_of_sale/wizard/pos_confirm.py | 2 +-
 addons/point_of_sale/wizard/pos_payment.py | 2 +-
 addons/point_of_sale/wizard/pos_return.py  | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 9b9e5b951b4..7687ee3aa4e 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -694,7 +694,7 @@ class pos_order(osv.osv):
                 if line.qty < 0:
                     location_id, output_id = output_id, location_id
             
-            self.pool.get('stock.picking').signal_button_confirm(cr, uid, [picking_id])
+            picking_obj.signal_button_confirm(cr, uid, [picking_id])
             picking_obj.force_assign(cr, uid, [picking_id], context)
         return True
 
@@ -704,7 +704,7 @@ class pos_order(osv.osv):
         """
         stock_picking_obj = self.pool.get('stock.picking')
         for order in self.browse(cr, uid, ids, context=context):
-            self.pool.get('stock.picking').signal_button_cancel(cr, uid, [order.picking_id.id])
+            stock_picking_obj.signal_button_cancel(cr, uid, [order.picking_id.id])
             if stock_picking_obj.browse(cr, uid, order.picking_id.id, context=context).state <> 'cancel':
                 raise osv.except_osv(_('Error!'), _('Unable to cancel the picking.'))
         self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
diff --git a/addons/point_of_sale/wizard/pos_confirm.py b/addons/point_of_sale/wizard/pos_confirm.py
index ebc432a846f..f37bdd9f8b8 100644
--- a/addons/point_of_sale/wizard/pos_confirm.py
+++ b/addons/point_of_sale/wizard/pos_confirm.py
@@ -36,7 +36,7 @@ class pos_confirm(osv.osv_memory):
                     todo = False
                     break
             if todo:
-                self.pool.get('pos.order').signal_done(cr, uid, [order.id])
+                order_obj.signal_done(cr, uid, [order.id])
 
         # Check if there is orders to reconcile their invoices
         ids = order_obj.search(cr, uid, [('state','=','invoiced'),('invoice_id.state','=','open')], context=context)
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 5f90f267f7e..47814761b20 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -66,7 +66,7 @@ class pos_make_payment(osv.osv_memory):
             order_obj.add_payment(cr, uid, active_id, data, context=context)
 
         if order_obj.test_paid(cr, uid, [active_id]):
-            self.pool.get('pos.order').signal_paid(cr, uid, [active_id])
+            order_obj.signal_paid(cr, uid, [active_id])
             return {'type' : 'ir.actions.act_window_close' }
          ##self.print_report(cr, uid, ids, context=context)
 
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index f711a2e56ee..b4e0e7b2041 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -155,7 +155,7 @@ class pos_return(osv.osv_memory):
                                                 'amount': -amount,
                                                 })
                 order_obj.write(cr,uid, [active_id,new_order], {'state': 'done'})
-                self.pool.get('stock.picking').signal_button_confirm(cr, uid, [new_picking])
+                picking_obj.signal_button_confirm(cr, uid, [new_picking])
                 picking_obj.force_assign(cr, uid, [new_picking], context)
             act = {
                 'domain': "[('id', 'in', ["+str(new_order)+"])]",
@@ -229,7 +229,7 @@ class add_product(osv.osv_memory):
                                 'date':date_cur
                             })
 
-                self.pool.get('stock.picking').signal_button_confirm(cr, uid, [new_picking])
+                picking_obj.signal_button_confirm(cr, uid, [new_picking])
                 picking_obj.force_assign(cr, uid, [new_picking], context)
                 order_obj.write(cr,uid,active_id,{'picking_id':new_picking})
 
@@ -302,7 +302,7 @@ class add_product(osv.osv_memory):
                         'name':'%s (return)' % order_id.name,
                         'date':date_cur,
                     })
-            self.poolget('stock.picking').signal_button_confirm(cr, uid, [new_picking])
+            picking_obj.signal_button_confirm(cr, uid, [new_picking])
             picking_obj.force_assign(cr, uid, [new_picking], context)
         obj=order_obj.browse(cr,uid, active_ids[0])
         context.update({'return':'return'})