Merge lp:~etsinko/openobject-addons/bug1131970 into lp:openobject-addons

[Amit Parik]

on_change_partner on sale and purchase check payment_terms and fiscal position available or not.

[Amit Parik (amit-parik)]

review: Approve

[Amit Parik (amit-parik)]

opps... there are lots of conflicts on your branch, I have seen only your last comment which is fine.

Please remove all conflicts.

Thank you!

review: Needs Fixing

[Egor Tsinko (etsinko)]

Hi Amit,
I branched from 7.0 Branch. Should I redo this with a trunk branch?

Thank you

[lp:~etsinko/openobject-addons/bug1131970]

8583. By Egor Tsinko on 2013-02-28

[Fix] Default net term in Purchase and Sales orders is overridden with blank

[Amit Parik (amit-parik)]

Hi Egor,

Yup, now its good.. :)

review: Approve

Unmerged revisions

8583. By Egor Tsinko on 2013-02-28

[Fix] Default net term in Purchase and Sales orders is overridden with blank

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2013-01-31 09:47:28 +0000
+++ purchase/purchase.py	2013-02-28 15:38:21 +0000
@@ -298,11 +298,12 @@
                 }}
         supplier_address = partner.address_get(cr, uid, [partner_id], ['default'])
         supplier = partner.browse(cr, uid, partner_id)
-        return {'value': {
-            'pricelist_id': supplier.property_product_pricelist_purchase.id,
-            'fiscal_position': supplier.property_account_position and supplier.property_account_position.id or False,
-            'payment_term_id': supplier.property_supplier_payment_term.id or False,
-            }}
+        value = {'pricelist_id': supplier.property_product_pricelist_purchase.id}
+        if supplier.property_supplier_payment_term:
+            value['payment_term_id'] = supplier.property_supplier_payment_term.id
+        if supplier.property_account_position:
+            value['fiscal_position'] = supplier.property_account_position.id
+        return {'value': value}
 
     def invoice_open(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')

=== modified file 'sale/sale.py'
--- sale/sale.py	2013-02-14 10:06:28 +0000
+++ sale/sale.py	2013-02-28 15:38:21 +0000
@@ -327,10 +327,12 @@
         val = {
             'partner_invoice_id': addr['invoice'],
             'partner_shipping_id': addr['delivery'],
-            'payment_term': payment_term,
-            'fiscal_position': fiscal_position,
             'user_id': dedicated_salesman,
         }
+        if fiscal_position:
+            val['fiscal_position'] = fiscal_position
+        if payment_term:
+            val['payment_term'] = payment_term
         if pricelist:
             val['pricelist_id'] = pricelist
         return {'value': val}