From f162ad8845ada71545bfcd79d5a77e923e904618 Mon Sep 17 00:00:00 2001
From: "rha@tinyerp.com" <>
Date: Mon, 3 Jan 2011 16:24:56 +0530
Subject: [PATCH 1/4] [Fix] stock: incoming shipments price is wrong

lp bug: https://launchpad.net/bugs/696372 fixed

bzr revid: rha@tinyerp.com-20110103105456-46dhel6b7b8891uc
---
 addons/purchase/purchase.py                  |  3 +-
 addons/stock/wizard/stock_partial_picking.py | 46 ++++++++++----------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 0de19189fc3..6adb726b97a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -455,6 +455,7 @@ class purchase_order(osv.osv):
                         'state': 'draft',
                         'purchase_line_id': order_line.id,
                         'company_id': order.company_id.id,
+                        'price_unit': order_line.price_unit
                     })
                     if order_line.move_dest_id:
                         self.pool.get('stock.move').write(cr, uid, [order_line.move_dest_id.id], {'location_id':order.location_id.id})
@@ -672,7 +673,7 @@ class purchase_order_line(osv.osv):
         seller_delay = 0
 
         prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1]
-        res = {} 
+        res = {}
         for s in prod.seller_ids:
             if s.name.id == partner_id:
                 seller_delay = s.delay
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index ad75c142a96..305304e8c7e 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -32,24 +32,24 @@ class stock_partial_picking(osv.osv_memory):
         'product_moves_out' : fields.one2many('stock.move.memory.out', 'wizard_id', 'Moves'),
         'product_moves_in' : fields.one2many('stock.move.memory.in', 'wizard_id', 'Moves'),
      }
-    
+
     def __is_in(self,cr, uid, pick_ids):
         """
             @return: True if one of the moves has as picking type 'in'
         """
         if not pick_ids:
             return False
-       
+
         pick_obj = self.pool.get('stock.picking')
         pick_ids = pick_obj.search(cr, uid, [('id','in',pick_ids)])
-        
-       
+
+
         for pick in pick_obj.browse(cr, uid, pick_ids):
             for move in pick.move_lines:
                 if pick.type == 'in' and move.product_id.cost_method == 'average':
                     return True
         return False
-    
+
     def __get_picking_type(self, cr, uid, pick_ids):
         if self.__is_in(cr, uid, pick_ids):
             return "product_moves_in"
@@ -62,11 +62,11 @@ class stock_partial_picking(osv.osv_memory):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
         result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
-       
-        
+
+
         picking_ids = context.get('active_ids', False)
         picking_type = self.__get_picking_type(cr, uid, picking_ids)
-        
+
         _moves_arch_lst = """<form string="%s">
                         <field name="date" invisible="1"/>
                         <separator colspan="4" string="%s"/>
@@ -77,7 +77,7 @@ class stock_partial_picking(osv.osv_memory):
                             'product_moves_in' : {'relation': 'stock.move.memory.in', 'type' : 'one2many', 'string' : 'Product Moves'},
                             'product_moves_out' : {'relation': 'stock.move.memory.out', 'type' : 'one2many', 'string' : 'Product Moves'}
                             })
-            
+
         _moves_arch_lst += """
                 <separator string="" colspan="4" />
                 <label string="" colspan="2"/>
@@ -100,10 +100,10 @@ class stock_partial_picking(osv.osv_memory):
             'prodlot_id' : picking.prodlot_id.id,
             'move_id' : picking.id,
         }
-    
+
         if is_in:
             move_memory.update({
-                'cost' : picking.product_id.standard_price,
+                'cost' : picking.price_unit,
                 'currency' : picking.product_id.company_id.currency_id.id,
             })
         return move_memory
@@ -112,23 +112,23 @@ class stock_partial_picking(osv.osv_memory):
         pick_obj = self.pool.get('stock.picking')
         if not context:
             context = {}
-               
+
         res = []
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', []), context):
             need_product_cost = (pick.type == 'in')
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
-                    continue           
+                    continue
                 res.append(self.__create_partial_picking_memory(m, need_product_cost))
-            
+
         return res
-    
+
     _defaults = {
         'product_moves_in' : __get_active_stock_pickings,
         'product_moves_out' : __get_active_stock_pickings,
         'date' : lambda *a : time.strftime('%Y-%m-%d %H:%M:%S'),
     }
-    
+
 
     def do_partial(self, cr, uid, ids, context=None):
         """ Makes partial moves and pickings done.
@@ -152,22 +152,22 @@ class stock_partial_picking(osv.osv_memory):
             p_moves = {}
             for product_move in moves_list:
                 p_moves[product_move.move_id.id] = product_move
-            
-            
+
+
             for move in pick.move_lines:
                 if move.state in ('done', 'cancel'):
                     continue
                 if not p_moves.get(move.id):
                     continue
-                
+
                 partial_datas['move%s' % (move.id)] = {
                     'product_id' : p_moves[move.id].id,
                     'product_qty' : p_moves[move.id].quantity,
                     'product_uom' :p_moves[move.id].product_uom.id,
                     'prodlot_id' : p_moves[move.id].prodlot_id.id,
                 }
-            
-               
+
+
                 if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
                     partial_datas['move%s' % (move.id)].update({
                                                     'product_price' : p_moves[move.id].cost,
@@ -176,8 +176,8 @@ class stock_partial_picking(osv.osv_memory):
         pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
         return {}
 
-        
-   
+
+
 
 stock_partial_picking()
 

From b59deb4743a40f45ca7fefe57e24a3b21072327b Mon Sep 17 00:00:00 2001
From: "rha@tinyerp.com" <>
Date: Wed, 5 Jan 2011 15:18:05 +0530
Subject: [PATCH 2/4] [Fix] Stock: wizard_partial_picking Average price
 computation doesnt work as expected

lp bug: https://launchpad.net/bugs/688493 fixed

bzr revid: rha@tinyerp.com-20110105094805-81s66oet81tgtfqf
---
 addons/stock/stock.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 97d5f9a0270..eede42d3d70 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1169,6 +1169,7 @@ class stock_picking(osv.osv):
             complete, too_many, too_few = [], [], []
             move_product_qty = {}
             prodlot_ids = {}
+            product_avail = {}
             for move in pick.move_lines:
                 if move.state in ('done', 'cancel'):
                     continue
@@ -1194,6 +1195,12 @@ class stock_picking(osv.osv):
                     move_currency_id = move.company_id.currency_id.id
                     context['currency_id'] = move_currency_id
                     qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
+
+                    if product.id in product_avail:
+                        product_avail[product.id] += qty
+                    else:
+                        product_avail[product.id] = product.qty_available
+
                     if qty > 0:
                         new_price = currency_obj.compute(cr, uid, product_currency,
                                 move_currency_id, product_price)
@@ -1204,9 +1211,8 @@ class stock_picking(osv.osv):
                         else:
                             # Get the standard price
                             amount_unit = product.price_get('standard_price', context)[product.id]
-                            new_std_price = ((amount_unit * product.qty_available)\
-                                + (new_price * qty))/(product.qty_available + qty)
-
+                            new_std_price = ((amount_unit * product_avail[product.id])\
+                                + (new_price * qty))/(product_avail[product.id] + qty)
                         # Write the field according to price type field
                         product_obj.write(cr, uid, [product.id], {'standard_price': new_std_price})
 

From bc8fe779879b79ff5d07e4b33b707b91a49262a3 Mon Sep 17 00:00:00 2001
From: "rha@tinyerp.com" <>
Date: Fri, 7 Jan 2011 10:12:30 +0530
Subject: [PATCH 3/4] [Fix]: Invoice from Picking not updating the status of
 the Purchase Order

lp bug: https://launchpad.net/bugs/697089 fixed

bzr revid: rha@tinyerp.com-20110107044230-dje9lzmt83ueksah
---
 addons/purchase/purchase.py                   | 16 +++++++
 addons/purchase/purchase_view.xml             | 24 +++++-----
 .../stock/wizard/stock_invoice_onshipping.py  | 48 ++++++++++---------
 .../wizard/stock_invoice_onshipping_view.xml  |  2 +-
 4 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6adb726b97a..b2127cf4214 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -817,4 +817,20 @@ class procurement_order(osv.osv):
 
 procurement_order()
 
+class stock_invoice_onshipping(osv.osv_memory):
+    _inherit = "stock.invoice.onshipping"
+
+    def create_invoice(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        purchase_obj = self.pool.get('purchase.order')
+        picking_obj = self.pool.get('stock.picking')
+        res = super(stock_invoice_onshipping,self).create_invoice(cr, uid, ids, context=context)
+        purchase_id =  picking_obj.browse(cr, uid, res.keys()[0]).purchase_id.id
+        purchase_obj.write(cr, uid, [purchase_id], {
+            'invoice_ids': [(4, res.values()[0])]}, context=context)
+        return res
+
+stock_invoice_onshipping()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 359810fb306..7fffad4e5c5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -12,10 +12,10 @@
             groups="group_purchase_manager"
             parent="base.menu_purchase_root" sequence="100"/>
 
-        <menuitem 
+        <menuitem
             id="menu_purchase_config_pricelist" name="Pricelists"
             parent="menu_purchase_config_purchase" sequence="50"/>
-            
+
         <menuitem
             action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
             parent="menu_purchase_config_pricelist" sequence="20"/>
@@ -29,22 +29,22 @@
             parent="menu_purchase_config_pricelist" sequence="2"
             groups="base.group_extended"/>
 
-        <menuitem 
+        <menuitem
             id="menu_product_in_config_purchase" name="Product"
             parent="menu_purchase_config_purchase" sequence="30"/>
-          
+
         <menuitem
             action="product.product_category_action_form" id="menu_product_category_config_purchase"
             parent="purchase.menu_product_in_config_purchase" sequence="10"/>
-          
-        <menuitem 
+
+        <menuitem
             id="menu_purchase_unit_measure_purchase" name="Units of Measure"
             parent="purchase.menu_product_in_config_purchase"  sequence="20"/>
-            
+
         <menuitem
              action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action"
              parent="menu_purchase_unit_measure_purchase" sequence="30"/>
-             
+
         <menuitem
               action="product.product_uom_form_action" id="menu_purchase_uom_form_action"
               parent="menu_purchase_unit_measure_purchase" sequence="30"/>
@@ -113,10 +113,10 @@
       <!--product menu-->
       <menuitem id="menu_procurement_management_product" name="Products"
           parent="base.menu_purchase_root" sequence="8"/>
-          
+
       <menuitem name="Products by Category" id="menu_product_by_category_purchase_form" action="product.product_category_action"
            parent="menu_procurement_management_product" sequence="10"/>
-          
+
       <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
           parent="menu_procurement_management_product"/>
 
@@ -292,7 +292,7 @@
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help">You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.</field>
         </record>
-        <menuitem action="purchase_rfq" id="menu_purchase_rfq" 
+        <menuitem action="purchase_rfq" id="menu_purchase_rfq"
             parent="menu_procurement_management"
             sequence="6"/>
 
@@ -458,7 +458,7 @@
             <field name="name">Purchase Lines Not Invoiced</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
-            <field name="domain">[('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
+            <field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="purchase_order_line_search"/>
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 091049b5689..c7eab1eef4d 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -85,34 +85,18 @@ class stock_invoice_onshipping(osv.osv_memory):
             raise osv.except_osv(_('Warning !'), _('None of these picking lists require invoicing.'))
         return res
 
-
-
-    def create_invoice(self, cr, uid, ids, context=None):
+    def open_invoice(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        picking_pool = self.pool.get('stock.picking')
-        data_pool = self.pool.get('ir.model.data')
-        onshipdata_obj = self.read(cr, uid, ids[0], ['journal_id', 'group', 'invoice_date'])
-        if context.get('new_picking', False):
-            onshipdata_obj['id'] = onshipdata_obj.new_picking
-            onshipdata_obj[ids] = onshipdata_obj.new_picking
-
-        context['date_inv'] = onshipdata_obj['invoice_date']
         invoice_ids = []
-        active_ids = context.get('active_ids', [])
-        active_picking = picking_pool.browse(cr, uid, context.get('active_id',False), context=context)
-        inv_type = picking_pool._get_invoice_type(active_picking)
-
-        res = picking_pool.action_invoice_create(cr, uid, active_ids,
-              journal_id = onshipdata_obj['journal_id'],
-              group = onshipdata_obj['group'],
-              type = None,
-              context=context)
+        data_pool = self.pool.get('ir.model.data')
+        res = self.create_invoice(cr, uid, ids, context=context)
         invoice_ids += res.values()
-        if not invoice_ids:
-            raise osv.except_osv(_('Error'), _('No Invoices were created'))
+        inv_type = context.get('inv_type', False)
         action_model = False
         action = {}
+        if not invoice_ids:
+            raise osv.except_osv(_('Error'), _('No Invoices were created'))
         if inv_type == "out_invoice":
             action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree1")
         elif inv_type == "in_invoice":
@@ -127,6 +111,26 @@ class stock_invoice_onshipping(osv.osv_memory):
             action['domain'] = "[('id','in', ["+','.join(map(str,invoice_ids))+"])]"
         return action
 
+    def create_invoice(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        picking_pool = self.pool.get('stock.picking')
+        onshipdata_obj = self.read(cr, uid, ids, ['journal_id', 'group', 'invoice_date'])
+        if context.get('new_picking', False):
+            onshipdata_obj['id'] = onshipdata_obj.new_picking
+            onshipdata_obj[ids] = onshipdata_obj.new_picking
+        context['date_inv'] = onshipdata_obj[0]['invoice_date']
+        active_ids = context.get('active_ids', [])
+        active_picking = picking_pool.browse(cr, uid, context.get('active_id',False), context=context)
+        inv_type = picking_pool._get_invoice_type(active_picking)
+        context['inv_type'] = inv_type
+        res = picking_pool.action_invoice_create(cr, uid, active_ids,
+              journal_id = onshipdata_obj[0]['journal_id'],
+              group = onshipdata_obj[0]['group'],
+              type = None,
+              context=context)
+        return res
+
 stock_invoice_onshipping()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 6a4cfec5fca..06d93f49ea1 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -15,7 +15,7 @@
                     <field name="invoice_date" />
                     <separator string="" colspan="4" />
                     <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-                    <button name="create_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
              </form>
             </field>
         </record>

From e9f7a90ac82d9b5e2a84bcba94d989f098c044c4 Mon Sep 17 00:00:00 2001
From: "rha@tinyerp.com" <>
Date: Fri, 7 Jan 2011 14:41:58 +0530
Subject: [PATCH 4/4] [Fix]: production orders waiting raw materials can not be
 cancelled

lp bug: https://launchpad.net/bugs/498033 fixed

bzr revid: rha@tinyerp.com-20110107091158-1qrugqztsw5ulktr
---
 addons/mrp/mrp.py       | 14 ++++++++++----
 addons/mrp/mrp_view.xml |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index a57b76bf2ce..c5ac35ce0df 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -444,7 +444,7 @@ class mrp_production(osv.osv):
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
         'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
 
-        'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True,
+        'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True, ondelete="restrict",
             help="This is the internal picking list that brings the finished product to the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
         'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
@@ -602,12 +602,18 @@ class mrp_production(osv.osv):
                 workcenter_line_obj.create(cr, uid, line)
         return len(results)
 
-    def action_cancel(self, cr, uid, ids):
+    def action_cancel(self, cr, uid, ids, context=None):
         """ Cancels the production order and related stock moves.
         @return: True
         """
+        if context is None:
+            context = {}
         move_obj = self.pool.get('stock.move')
-        for production in self.browse(cr, uid, ids):
+        for production in self.browse(cr, uid, ids, context=context):
+            if production.picking_id.state not in ('draft', 'cancel'):
+                raise osv.except_osv(
+                    _('Could not cancel manufacturing order !'),
+                    _('You must first cancel related picking attached to this manufacturing order.'))
             if production.move_created_ids:
                 move_obj.action_cancel(cr, uid, [x.id for x in production.move_created_ids])
             move_obj.action_cancel(cr, uid, [x.id for x in production.move_lines])
@@ -664,7 +670,7 @@ class mrp_production(osv.osv):
         """
         stock_mov_obj = self.pool.get('stock.move')
         production = self.browse(cr, uid, production_id, context=context)
-        
+
         final_product_todo = []
 
         produced_qty = 0
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 000ae6cbcf2..f6b7fb78b88 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -630,7 +630,8 @@
                             <separator colspan="4"/>
                             <group col="9" colspan="4">
                                 <field name="state"/>
-                                <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
+                                <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
+                                <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
                                 <button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
                                 <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>