← Back to team overview

openerp-dev-web team mailing list archive

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

 

Rohan Nayani(openerp) has proposed merging lp:~openerp-dev/openobject-addons/ron-dev-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #606325 EAN code validation fails
  https://bugs.launchpad.net/bugs/606325
  #627936 mrp: procurement from orderpoints is generated for non-active, non-purchasable products (5.0)
  https://bugs.launchpad.net/bugs/627936
  #634856 [mrp] constraint needed for orderpoints (5.0)
  https://bugs.launchpad.net/bugs/634856
  #663890 Creating invoices and grouping multiplies services
  https://bugs.launchpad.net/bugs/663890
  #666362 [6.0RC1] sale Invoice Control "Not from Picking" is bad wording
  https://bugs.launchpad.net/bugs/666362
  #667246 Wrong Journals when creating an invoice from picking
  https://bugs.launchpad.net/bugs/667246
  #667324 invoicing control in purchase orders
  https://bugs.launchpad.net/bugs/667324
  #669210 [trunk][mrp] stock_move.action_consume raises exception
  https://bugs.launchpad.net/bugs/669210
  #670056 [6.0RC1] stock moves - missing search field "Reference"
  https://bugs.launchpad.net/bugs/670056
  #670652 Demo data of purchase order is not relevant in terms of supplier address
  https://bugs.launchpad.net/bugs/670652
  #670921 Purchase module : problems in group by in seach view
  https://bugs.launchpad.net/bugs/670921
  #671172 Return packingnumber hardcoded {'name':'%s (return)' % pick.name
  https://bugs.launchpad.net/bugs/671172
  #671386 PO Line description doesn't take Supplier Product Name or Code in Product's Suppliers Tab
  https://bugs.launchpad.net/bugs/671386
  #673572 [6.0 RC1] Stock move in done state add a pack and production lot
  https://bugs.launchpad.net/bugs/673572
  #677429 [6.0RC1][purchase]Invoice journal(s) not loaded properly
  https://bugs.launchpad.net/bugs/677429
  #690115 A "Purchase / Manager" does not have more rights than a "Purchase / User". Statistics report should not be allow for "Purchase/User" group.
  https://bugs.launchpad.net/bugs/690115
  #690228 shouldn't be able to change the company after have vaidated an inventory 
  https://bugs.launchpad.net/bugs/690228
  #690581 Stock_planning : Unable to create Forecasting periods.
  https://bugs.launchpad.net/bugs/690581
  #690763 PRODUCT V6 : the ean13 check is incorrect
  https://bugs.launchpad.net/bugs/690763
  #691012 [trunk][mrp] bugfix on consuming materials introduced two new bugs
  https://bugs.launchpad.net/bugs/691012
  #691709 procurement exception when there is stock
  https://bugs.launchpad.net/bugs/691709
  #692827 Procurement Module view arch missing some fields in tree
  https://bugs.launchpad.net/bugs/692827
  #692913 [6.0] PO - Button "Approved" shows approved AND done
  https://bugs.launchpad.net/bugs/692913
  #693056 price_multi_get() is comparing pricelist_ids to pricelist_version_ids
  https://bugs.launchpad.net/bugs/693056
  #693806 Invalid literal for int() in sequence with prefix
  https://bugs.launchpad.net/bugs/693806
  #697085 Backorder Cannot be create on Incoming Shipment
  https://bugs.launchpad.net/bugs/697085
  #697142 Unicode encoding problem on stock module
  https://bugs.launchpad.net/bugs/697142
  #697209 Belgium not defined as an Intrastat member by default
  https://bugs.launchpad.net/bugs/697209
  #700963 Update button at product form: Stock update without production lot possible: Tracking production lot wanted
  https://bugs.launchpad.net/bugs/700963
  #702198 [trunk]product][account] Typo Weigths
  https://bugs.launchpad.net/bugs/702198
  #702871 create a min stock rule from the right pannel of product
  https://bugs.launchpad.net/bugs/702871
  #707809 UnicodeEncodeError in addons\stock\wizard\stock_change_product_qty.py
  https://bugs.launchpad.net/bugs/707809
  #711236 Task summary is not interpretable when Tasks are created from Manufacturing Order
  https://bugs.launchpad.net/bugs/711236
  #713212 production lot and shipping direct from Sales Order
  https://bugs.launchpad.net/bugs/713212

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/ron-dev-addons2/+merge/48893

https://bugs.launchpad.net/openobject-addons/+bug/713212
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/ron-dev-addons2/+merge/48893
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/ron-dev-addons2.
=== modified file 'stock/stock.py'
--- stock/stock.py	2011-02-03 13:34:18 +0000
+++ stock/stock.py	2011-02-08 10:26:20 +0000
@@ -1247,9 +1247,9 @@
 
             if new_picking:
                 move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
-                for move in complete:
-                    if prodlot_ids.get(move.id):
-                        move_obj.write(cr, uid, move.id, {'prodlot_id': prodlot_ids[move.id]})
+            for move in complete:
+                if prodlot_ids.get(move.id):
+                    move_obj.write(cr, uid, move.id, {'prodlot_id': prodlot_ids[move.id]})
             for move in too_many:
                 product_qty = move_product_qty[move.id]
                 defaults = {


Follow ups