Merge lp:~dorian-kemps/unifield-server/US-5713 into lp:unifield-server

[jftempo]

Unmerged revisions

5318. By Dorian on 2019-04-26

US-5713 [FIX] PO line: Added state field

5317. By Dorian on 2019-04-26

US-5713 [FIX] PO line: Fixed price on qty on_change

5316. By Dorian on 2019-04-26

US-5713 [FIX] PO line: Fixed price on qty on_change

5315. By Dorian on 2019-04-25

US-5713 [IMP] PO line: Change price unit according to product's suppliers on draft lines when qty is changed.

=== modified file 'bin/addons/order_nomenclature/order_nomenclature.py'
--- bin/addons/order_nomenclature/order_nomenclature.py	2019-02-28 14:57:40 +0000
+++ bin/addons/order_nomenclature/order_nomenclature.py	2019-05-03 09:52:04 +0000
@@ -118,12 +118,11 @@
 
     def product_qty_change(self, cr, uid, ids, pricelist, product, qty, uom,
                            partner_id, date_order=False, fiscal_position=False, date_planned=False,
-                           name=False, price_unit=False, notes=False, state=False, old_unit_price=False,
-                           nomen_manda_0=False, comment=False,context=None):
+                           name=False, price_unit=False, notes=False, state=False, line_state=False,
+                           old_unit_price=False, nomen_manda_0=False, comment=False,context=None):
         '''
         interface product_id_change to avoid the reset of Comment field when the qty is changed
         '''
-
         if not context:
             context = {}
 
@@ -153,6 +152,25 @@
         if qty:
             uom = uom or result.get('value', {}).get('product_uom')
             result = self.pool.get('product.uom')._change_round_up_qty(cr, uid, uom, qty, 'product_qty', result=result)
+            if product and line_state == 'draft':
+                prod = self.pool.get('product.product').browse(cr, uid, product, fields_to_fetch=['standard_price', 'seller_ids'], context=context)
+                if prod.seller_ids:
+                    cat_found = False
+                    cr.execute("""
+                        SELECT cal.unit_price 
+                        FROM product_supplierinfo ps, supplier_catalogue_line cal
+                        WHERE cal.supplier_info_id = ps.id AND ps.id IN %s AND cal.product_id = %s 
+                            AND cal.min_qty <= %s AND ps.name = %s
+                        ORDER BY ps.sequence
+                    """ % (tuple([s.id for s in prod.seller_ids]), product, qty, partner_id))
+                    for cat_line in cr.fetchall():
+                        result['value']['price_unit'] = cat_line[0]
+                        cat_found = True
+                        break
+                    if not cat_found:
+                        result['value']['price_unit'] = prod.standard_price
+                elif price_unit != 0:
+                    result['value']['price_unit'] = price_unit
 
         self.check_digits(cr, uid, result, context=context)
         return result

=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2019-02-27 14:15:35 +0000
+++ bin/addons/purchase/purchase_view.xml	2019-05-03 09:52:04 +0000
@@ -245,7 +245,7 @@
                                     <field name="internal_code" invisible="True"/>
                                     <field name="internal_name" invisible="True"/>
                                     <field name="supplier_name" invisible="True"/>
-                                    <field name="product_qty" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_qty_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,parent.state,old_price_unit,'','', context)" string="Qty"/>
+                                    <field name="product_qty" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_qty_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,parent.state,state,old_price_unit,'','', context)" string="Qty"/>
                                     <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)" domain="[('uom_by_product', '=', product_id)]"/>
                                     <field name="price_unit" on_change="price_unit_change(fake_id, price_unit, product_id, product_uom, product_qty, parent.pricelist_id, parent.partner_id, parent.date_order, change_price_ok, parent.state, old_price_unit, '', '', context)"/>
                                     <field name="price_subtotal"/>
@@ -265,6 +265,7 @@
                                     <field name="tender_line_id" invisible="1"/>
                                     <field name="to_correct_ok" invisible="1"/>
                                     <field name="esc_confirmed" readonly="1" invisible="context.get('partner_type', False) != 'esc'" attrs="{'invisible': [('fake_state', '!=', 'draft')]}"/>
+                                    <field name="state" invisible="1"/>
                                     <field name="fake_state" invisible="1"/>
                                     <field name="state_to_display"/>
                                     <field name="inactive_product" invisible="1"/>
@@ -642,7 +643,7 @@
                                 <field name="original_price" colspan="1" readonly="1"/>
                                 <field name="original_uom" colspan="1" readonly="1"/>
                                 <field name="original_product" colspan="2" readonly="1" />
-                                <field name="product_qty" string="Current Qty" colspan="1" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_qty_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,parent.state,old_price_unit,nomen_manda_0,comment, context)" />
+                                <field name="product_qty" string="Current Qty" colspan="1" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_qty_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,parent.state,state,old_price_unit,nomen_manda_0,comment, context)" />
                                 <field name="price_unit" string="Current Price" colspan="1" on_change="price_unit_change(fake_id, price_unit, product_id, product_uom, product_qty, parent.pricelist_id, parent.partner_id, parent.date_order, change_price_ok, parent.state, old_price_unit, nomen_manda_0, comment, context)"/>
                                 <field name="original_currency_id" colspan="1" readonly="1"/>
                                 <field name="modification_comment" colspan="2" />
@@ -775,7 +776,7 @@
                                 </html>
                             </group>
                             <field name="product_id" colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id, available_for_restriction=parent.partner_type,search_default_not_restricted=1,categ=parent.categ" on_change="product_id_on_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,parent.state,old_price_unit,nomen_manda_0,comment,context)" attrs="{'readonly': [('tender_line_id', '!=', False)]}" default_focus="1"/>
-                            <field name="product_qty" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_qty_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,parent.state,old_price_unit,nomen_manda_0,comment, context)"/>
+                            <field name="product_qty" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_qty_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,parent.state,state,old_price_unit,nomen_manda_0,comment, context)"/>
                             <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)" domain="[('uom_by_product', '=', product_id)]"/>
                             <field name="price_unit" on_change="price_unit_change(fake_id, price_unit, product_id, product_uom, product_qty, parent.pricelist_id, parent.partner_id, parent.date_order, change_price_ok, parent.state, old_price_unit, nomen_manda_0, comment, context)"/>
                             <field name="currency_id"/>