Merge lp:~openerp-dev/openobject-addons/trunk-bug-1172239-cha into lp:openobject-addons

Proposed by Ajay Chauhan(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1172239-cha
Merge into: lp:openobject-addons
Diff against target: 43 lines (+4/-4)
2 files modified
sale/sale.py (+2/-2)
sale/sale_view.xml (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1172239-cha
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+161401@code.launchpad.net

Description of the change

Hello,

  I have solved bug: https://bugs.launchpad.net/openobject-addons/+bug/1172239
  Issue is that when we add description in sale order line & then we change the uom the changes for description is lost.

Thanks,
Ajay Chauhan(CHA)

To post a comment you must log in.

Unmerged revisions

8694. By Ajay Chauhan(OpenERP)

[FIX] sale: solved issue that description is lost when change uom in sale order line

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale/sale.py'
2--- sale/sale.py 2013-04-22 15:34:49 +0000
3+++ sale/sale.py 2013-04-29 11:35:59 +0000
4@@ -972,7 +972,7 @@
5
6 def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
7 uom=False, qty_uos=0, uos=False, name='', partner_id=False,
8- lang=False, update_tax=True, date_order=False, context=None):
9+ lang=False, update_tax=True, date_order=False, flag=False, context=None):
10 context = context or {}
11 lang = lang or ('lang' in context and context['lang'])
12 if not uom:
13@@ -980,7 +980,7 @@
14 return self.product_id_change(cursor, user, ids, pricelist, product,
15 qty=qty, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
16 partner_id=partner_id, lang=lang, update_tax=update_tax,
17- date_order=date_order, context=context)
18+ date_order=date_order, flag=flag, context=context)
19
20 def unlink(self, cr, uid, ids, context=None):
21 if context is None:
22
23=== modified file 'sale/sale_view.xml'
24--- sale/sale_view.xml 2013-04-22 15:34:49 +0000
25+++ sale/sale_view.xml 2013-04-29 11:35:59 +0000
26@@ -189,7 +189,7 @@
27 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
28 <field name="product_uom" groups="product.group_uom" class="oe_inline oe_no_button"
29
30- on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
31+ on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, True, context)"/>
32 </div>
33 <label for="product_uos_qty" groups="product.group_uos"/>
34 <div groups="product.group_uos">
35@@ -230,7 +230,7 @@
36 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
37 on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
38 <field name="product_uom"
39- on_change="product_uom_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, context)"
40+ on_change="product_uom_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, True, context)"
41 groups="product.group_uom" options='{"no_open": True}'/>
42 <field name="product_uos_qty" groups="product.group_uos" invisible="1"/>
43 <field name="product_uos" string="UoS" groups="product.group_uos" invisible="1"/>

Subscribers

People subscribed via source and target branches

to all changes: