← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/rpa-dev-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2

 

Rucha (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/rpa-dev-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #511193 unit factor is limited to 5 zeros
  https://bugs.launchpad.net/bugs/511193
  #641110 Cannot record outgoing stock move with prodlot for consumable products
  https://bugs.launchpad.net/bugs/641110
  #663662 [6.0rc1] bug in 'request a quotation' from PR
  https://bugs.launchpad.net/bugs/663662
  #663999 [6.0RC1] delivery - usability issues
  https://bugs.launchpad.net/bugs/663999
  #664344 Unclear help texts in product_expiry
  https://bugs.launchpad.net/bugs/664344
  #666781 useless list comprehension and browse in split_moves
  https://bugs.launchpad.net/bugs/666781
  #667327 [v6 RC1] Consume products in Production order not working in GTK client
  https://bugs.launchpad.net/bugs/667327
  #667558 product_visible_discount uses discount in changing UoM in sale order of OpenERP v6.0 rc1
  https://bugs.launchpad.net/bugs/667558
  #683718 [v6 RC1] stock addon: _product_value badly implemented
  https://bugs.launchpad.net/bugs/683718
  #690034 no translation in pricelist report
  https://bugs.launchpad.net/bugs/690034

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/rpa-dev-addons2/+merge/46125
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/rpa-dev-addons2/+merge/46125
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/rpa-dev-addons2.
=== modified file 'purchase/purchase_demo.xml'
--- purchase/purchase_demo.xml	2011-01-04 05:28:08 +0000
+++ purchase/purchase_demo.xml	2011-01-13 13:23:15 +0000
@@ -10,14 +10,14 @@
 
         <record id="order_purchase1" model="purchase.order">
             <field name="location_id" ref="stock.stock_location_stock"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+            <field name="pricelist_id" ref="purchase.list0"/>
             <field name="partner_id" ref="base.res_partner_asus"/>
             <field name="partner_address_id" ref="base.res_partner_address_tang"/>
         </record>
 
         <record id="order_purchase2" model="purchase.order">
             <field name="location_id" ref="stock.stock_location_stock"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+            <field name="pricelist_id" ref="purchase.list0"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field name="partner_address_id" ref="base.res_partner_address_zen"/>
         </record>

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-01-12 16:44:40 +0000
+++ stock/stock.py	2011-01-13 13:23:15 +0000
@@ -2221,6 +2221,8 @@
                 'tracking_id': move.tracking_id.id,
                 'prodlot_id': move.prodlot_id.id,
             }
+            if move.location_id.usage <> 'internal':
+                default_val.update({'location_id': move.location_dest_id.id})
             new_move = self.copy(cr, uid, move.id, default_val)
 
             res += [new_move]


Follow ups