Merge lp:~vivekimsit/openobject-addons/extra_addons_changes into lp:openobject-addons/extra-6.0

[Vivek poddar]

The modules[purchase_early_payment_discount and purchase_payment] were broken due to the wrong context params, also it produced errors on confirming a purchase order. My merge resolves the issue.

[Stefan Rijnhart (Opener) (stefan-opener)]

Alright, as this should fix the problem. But perhaps you could also fix the indentation of the function arguments while you are at it? See the 'Indentation' section of pep8 (http://www.python.org/dev/peps/pep-0008/#id10)

review: Needs Fixing

[Vivek poddar (vivekimsit)]

Hi,

You are talking of every functions's or just the one which I corrected.

Thanks and Regards!

[Stefan Rijnhart (Opener) (stefan-opener)]

No just these two!

=== modified file 'purchase_early_payment_discount/purchase.py'
--- purchase_early_payment_discount/purchase.py	2012-03-02 19:27:50 +0000
+++ purchase_early_payment_discount/purchase.py	2012-12-11 09:31:43 +0000
@@ -148,13 +148,14 @@
                     res['early_payment_discount'] = False
         return {'value': res}
 
-    def action_invoice_create(self, cr, uid, ids, *args):
+    def action_invoice_create(self, cr, uid, ids, context=None):
         """
             Inherited method for writing early_payment_discount value in
             created invoice
         """
-        invoice_id = super(purchase_order, self).action_invoice_create(cr,
-                                                                uid, ids, args)
+        invoice_id = super(purchase_order, self).action_invoice_create(
+                                                        cr, uid, ids, 
+                                                        context=context)
         invoice_obj = self.pool.get('account.invoice')
         current_purchase = self.browse(cr, uid, ids)[0]
         if current_purchase.early_payment_discount:
 
=== modified file 'purchase_payment/purchase_payment.py'
--- purchase_payment/purchase_payment.py	2012-03-21 13:06:14 +0000
+++ purchase_payment/purchase_payment.py	2012-12-11 09:31:43 +0000
@@ -69,13 +69,15 @@
         result['value']['partner_bank'] = False
         return result
 
-    def action_invoice_create(self, cr, uid, ids, *args):
+    def action_invoice_create(self, cr, uid, ids, context=None):
         """
         Extend the invoice creation action to preset the payment options.
         """
         # Create the invoice as usual.
-        invoice_id = super(purchase_order, self).action_invoice_create(cr, uid, ids, args)
-
+        invoice_id = super(purchase_order, self).action_invoice_create(
+                                                        cr, uid,
+                                                        ids, context=context)
+        
         #
         # Check if the order has payment info.
         #