[IMP]: fix the problem of account_receivable and remove the Finish button form pos_pa...

[odoo/odoo.git] / addons / point_of_sale / wizard / pos_payment.py

diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 2929925..3ad2d27 100644 (file)
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -53,15 +53,16 @@ class pos_make_payment(osv.osv_memory):
         else:
             journal = None
 
-        order = self.pool.get('pos.order').browse(cr, uid, record_id, context)
+        order_obj=self.pool.get('pos.order')
+        order = order_obj.browse(cr, uid, record_id, context)
         #get amount to pay
         amount = order.amount_total - order.amount_paid
 
         if amount <= 0.0:
             context.update({'flag': True})
-            self.pool.get('pos.order').action_paid(cr, uid, [record_id], context)
+            order_obj.action_paid(cr, uid, [record_id], context)
         elif order.amount_paid > 0.0:
-            self.pool.get('pos.order').write(cr, uid, [record_id], {'state': 'advance'})
+            order_obj.write(cr, uid, [record_id], {'state': 'advance'})
 
         invoice_wanted_checked = False
 
@@ -183,12 +184,6 @@ class pos_make_payment(osv.osv_memory):
             'datas': datas,
        }
 
-    def trigger_wkf(self, cr, uid, data, context):
-        record_id = context and context.get('active_id', False)
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'pos.order', record_id, 'payment', cr)
-        return {}
-
     _columns = {
         'journal': fields.selection(pos_box_entries.get_journal, "Journal", required=True),
         'product_id': fields.many2one('product.product', "Acompte"),