Merge lp:~openerp-dev/openobject-addons/7.0-opw-600945-msh into lp:openobject-addons/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of due_date in invoice not came according to invoice_date when invoice_date set after selecting partner, if there is already a invoice_date avaialable then onchange_partner_id returns due_date according to invoice_date + payment term days but if partner is selected and then invoice_date changed then due_date not calculated according to invoice_date.

Demo: Go to Customer/Supplier Invoice, select a partner which has payment term set, after selecting partner you will see due date is calculated according to partner's payment term but after that change the Invoice Date, Due Date doesn't changed, select Invoice Date first and then select partner which has payment term set, you will get Due Date with respect of Invoice Date.

on_change_invoice_date method should be there which is called when invoice date changed.

Thanks.

[lp:~openerp-dev/openobject-addons/7.0-opw-600945-msh]

9603. By Mohammed Shekha(OpenERP)<email address hidden> on 2013-11-20

[FIX]]Account: Re-fixed the issue of due_date in invoice not came according to invoice_date when invoice_date set after selecting partner, if there is already a invoice_date avaialable then onchange_partner_id returns due_date according to invoice_date + payment term days but if partner is selected and then invoice_date changed then due_date not calculated according to invoice_date.

[Vinay Rana (OpenERP) (vra-openerp)]

review: Approve

Unmerged revisions

9603. By Mohammed Shekha(OpenERP)<email address hidden> on 2013-11-20

[FIX]]Account: Re-fixed the issue of due_date in invoice not came according to invoice_date when invoice_date set after selecting partner, if there is already a invoice_date avaialable then onchange_partner_id returns due_date according to invoice_date + payment term days but if partner is selected and then invoice_date changed then due_date not calculated according to invoice_date.

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-09-20 09:50:26 +0000
+++ account/account_invoice.py	2013-11-20 05:33:24 +0000
@@ -558,6 +558,17 @@
                 }
         return result
 
+    def onchange_date_invoice(self, cr, uid, ids, type, partner_id, date_invoice):
+        if not partner_id:
+            return {'value': {}}
+        p = self.pool.get('res.partner').browse(cr, uid, partner_id)
+        if type in ('out_invoice', 'out_refund'):
+            partner_payment_term = p.property_payment_term and p.property_payment_term.id or False
+        else:
+            partner_payment_term = p.property_supplier_payment_term and p.property_supplier_payment_term.id or False
+        return self.onchange_payment_term_date_invoice(
+                    cr, uid, ids, partner_payment_term, date_invoice)
+
     def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
         res = {}
         if isinstance(ids, (int, long)):

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2013-09-20 09:50:26 +0000
+++ account/account_invoice_view.xml	2013-11-20 05:33:24 +0000
@@ -177,7 +177,7 @@
                             </div>
                         </group>
                         <group>
-                            <field name="date_invoice"/>
+                            <field name="date_invoice" on_change="onchange_date_invoice(type, partner_id, date_invoice)"/>
                             <field name="date_due"/>
                             <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
                                 name="account_id" groups="account.group_account_user"/>
@@ -326,7 +326,7 @@
                             <field name="fiscal_position" widget="selection" />
                         </group>
                         <group>
-                            <field name="date_invoice"/>
+                            <field name="date_invoice" on_change="onchange_date_invoice(type, partner_id, date_invoice)" />
                             <field name="journal_id" groups="account.group_account_user"
                                 on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
                             <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]"