openerp-dev-web team mailing list archive

["Rohan Nayani\(openerp\)" <ron@xxxxxxxxxxx>]

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
  #709065 cancelling MO given - given arguments wrong
  https://bugs.launchpad.net/bugs/709065
  #711236 Task summary is not interpretable when Tasks are created from Manufacturing Order
  https://bugs.launchpad.net/bugs/711236
  #711269 (6.0.1) Problem in Manufacturing Operation
  https://bugs.launchpad.net/bugs/711269
  #713212 production lot and shipping direct from Sales Order
  https://bugs.launchpad.net/bugs/713212
  #716705 Product UoM conversion error needs definition
  https://bugs.launchpad.net/bugs/716705

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

* https://bugs.launchpad.net/openobject-addons/+bug/709065
* https://bugs.launchpad.net/openobject-addons/+bug/716705
* https://bugs.launchpad.net/openobject-addons/+bug/711269
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/ron-dev-addons2/+merge/49618
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/ron-dev-addons2.

=== modified file 'mrp_operations/mrp_operations.py'
--- mrp_operations/mrp_operations.py	2011-01-14 00:11:01 +0000
+++ mrp_operations/mrp_operations.py	2011-02-14 12:24:47 +0000
@@ -119,11 +119,12 @@
         @return: Nothing
         """
         wf_service = netsvc.LocalService("workflow")
+        prod_obj_pool = self.pool.get('mrp.production')
         oper_obj = self.browse(cr, uid, ids)[0]
         prod_obj = oper_obj.production_id
         if action == 'start':
                if prod_obj.state =='confirmed':
-                   self.pool.get('mrp.production').force_production(cr, uid, [prod_obj.id])
+                   prod_obj_pool.force_production(cr, uid, [prod_obj.id])
                    wf_service.trg_validate(uid, 'mrp.production', prod_obj.id, 'button_produce', cr)
                elif prod_obj.state =='ready':
                    wf_service.trg_validate(uid, 'mrp.production', prod_obj.id, 'button_produce', cr)
@@ -139,6 +140,9 @@
                 if line.state != 'done':
                      flag = False
             if flag:
+                for production in prod_obj_pool.browse(cr, uid, [prod_obj.id], context= None):
+                    if production.move_lines or production.move_created_ids:
+                        prod_obj_pool.action_produce(cr,uid, production.id, production.product_qty, 'consume_produce', context = None)
                 wf_service.trg_validate(uid, 'mrp.production', oper_obj.production_id.id, 'button_produce_done', cr)
         return
 
@@ -244,10 +248,12 @@
             wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_start_working', cr)
         return super(mrp_production,self).action_in_production(cr, uid, ids)
     
-    def action_cancel(self, cr, uid, ids):
+    def action_cancel(self, cr, uid, ids, context=None):
         """ Cancels work order if production order is canceled.
         @return: Super method
         """
+        if context is None:
+            context = {}
         obj = self.browse(cr, uid, ids)[0]
         wf_service = netsvc.LocalService("workflow")
         for workcenter_line in obj.workcenter_lines:

=== modified file 'product/product.py'
--- product/product.py	2011-02-08 11:04:12 +0000
+++ product/product.py	2011-02-14 12:24:47 +0000
@@ -139,7 +139,7 @@
             context = {}
         if from_unit.category_id.id <> to_unit.category_id.id:
             if context.get('raise-exception', True):
-                raise osv.except_osv(_('Error !'), _('Conversion from Product UoM m to Default UoM PCE is not possible as they both belong to different Category!.'))
+                raise osv.except_osv(_('Error !'), _('Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!.') % (from_unit.name,to_unit.name,))
             else:
                 return qty
         amount = qty / from_unit.factor