Merge lp:~rr.clearcorp/openobject-addons/7.0-pending_merge into lp:~clearcorp-drivers/openobject-addons/7.0-ccorp

[Ronald Rubi]

[FIX] Merge patch opw_594956_due_date.patch, account_invoice: due date is reset to current date when we have no payment term and due date is manually defined

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-06-12 15:38:14 +0000
+++ account/account_invoice.py	2013-07-15 16:40:38 +0000
@@ -560,10 +560,14 @@
 
     def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
         res = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         if not date_invoice:
             date_invoice = time.strftime('%Y-%m-%d')
         if not payment_term_id:
-            return {'value':{'date_due': date_invoice}} #To make sure the invoice has a due date when no payment term
+            inv = self.browse(cr, uid, ids[0])
+            #To make sure the invoice due date should contain due date which is entered by user when there is no payment term defined
+            return {'value':{'date_due': inv.date_due and inv.date_due or date_invoice}}
         pterm_list = self.pool.get('account.payment.term').compute(cr, uid, payment_term_id, value=1, date_ref=date_invoice)
         if pterm_list:
             pterm_list = [line[0] for line in pterm_list]