Merge lp:~openerp-commiter/openobject-addons/trunk-addons-aag into lp:openobject-addons

[Atik Agewan(OpenERP)]

changes in Read method of osv meme wiz

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2011-02-14 11:45:07 +0000
+++ mrp/mrp.py	2011-02-16 05:24:17 +0000
@@ -240,11 +240,29 @@
                 return False
             level -= 1
         return True
+
+    def _check_product(self, cr, uid, ids, context=None):
+        all_prod = []
+        bom_obj = self.pool.get('mrp.bom')
+        boms = self.browse(cr, uid, ids, context=context)
+        def check_bom(boms):
+            res = True
+            for bom in boms:
+                if bom.product_id.id in all_prod:
+                    res = res and False
+                all_prod.append(bom.product_id.id)
+                lines = bom.bom_lines
+                if lines:
+                    newboms = [a for a in lines if a not in boms]
+                    res = res and check_bom(newboms)
+            return res
+        return check_bom(boms)
+
     _constraints = [
-        (_check_recursion, 'Error ! You can not create recursive BoM.', ['parent_id'])
+        (_check_recursion, 'Error ! You can not create recursive BoM.', ['parent_id']),
+        (_check_product, 'BoM line product should not be same as BoM product.', ['product_id']),
     ]
 
-
     def onchange_product_id(self, cr, uid, ids, product_id, name, context=None):
         """ Changes UoM and name if product_id changes.
         @param name: Name of the field
 
=== 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-16 05:24:17 +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 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml	2011-01-17 13:55:22 +0000
+++ procurement/procurement_view.xml	2011-02-16 05:24:17 +0000
@@ -28,6 +28,7 @@
             <field name="name">procurement.order.tree.board</field>
             <field name="model">procurement.order</field>
             <field name="type">tree</field>
+            <field eval="20" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state in ('exception');black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
                     <field name="date_planned" widget="date"/>
@@ -246,8 +247,8 @@
         <act_window
         context="{'search_default_warehouse_id': active_id}"
         id="act_stock_warehouse_2_stock_warehouse_orderpoint"
-        name="Minimum Stock Rules" 
-        res_model="stock.warehouse.orderpoint" 
+        name="Minimum Stock Rules"
+        res_model="stock.warehouse.orderpoint"
         src_model="stock.warehouse"
         groups="stock.group_stock_user"/>
 
 
=== modified file 'product/pricelist.py'
--- product/pricelist.py	2011-01-17 08:00:48 +0000
+++ product/pricelist.py	2011-02-16 05:24:17 +0000
@@ -262,9 +262,9 @@
                             price = currency_obj.compute(cr, uid,
                                     price_type.currency_id.id, res['currency_id'],
                                     product_obj.price_get(cr, uid, [product_id],
-                                        price_type.field)[product_id], round=False, context=context)
+                                        price_type.field, context=context)[product_id], round=False, context=context)
 
-                        if price:
+                        if price >= 0.0:
                             price_limit = price
 
                             price = price * (1.0+(res['price_discount'] or 0.0))
@@ -385,7 +385,7 @@
                         else:
                             price_tmp = self.price_get(cr, uid,
                                     [res['base_pricelist_id']], prod_id,
-                                    qty)[res['base_pricelist_id']]
+                                    qty, context=context)[res['base_pricelist_id']]
                             ptype_src = self.browse(cr, uid,
                                     res['base_pricelist_id']).currency_id.id
                             price = currency_obj.compute(cr, uid, ptype_src,
@@ -413,7 +413,7 @@
                         price = currency_obj.compute(cr, uid,
                                 price_type.currency_id.id, res['currency_id'],
                                 product_obj.price_get(cr, uid, [prod_id],
-                                    price_type.field)[prod_id], round=False, context=context)
+                                    price_type.field, context=context)[prod_id], round=False, context=context)
 
                     if price:
                         price_limit = price
 
=== modified file 'product/product.py'
--- product/product.py	2011-02-01 12:34:28 +0000
+++ product/product.py	2011-02-16 05:24:17 +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
@@ -766,12 +766,12 @@
         currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
         for supplier in partner_pool.browse(cr, uid, supplier_ids, context=context):
             # Compute price from standard price of product
-            price = product_pool.price_get(cr, uid, [product_id], 'standard_price')[product_id]
+            price = product_pool.price_get(cr, uid, [product_id], 'standard_price', context=context)[product_id]
 
             # Compute price from Purchase pricelist of supplier
             pricelist_id = supplier.property_product_pricelist_purchase.id
             if pricelist_id:
-                price = pricelist_pool.price_get(cr, uid, [pricelist_id], product_id, product_qty).setdefault(pricelist_id, 0)
+                price = pricelist_pool.price_get(cr, uid, [pricelist_id], product_id, product_qty, context=context).setdefault(pricelist_id, 0)
                 price = currency_pool.compute(cr, uid, pricelist_pool.browse(cr, uid, pricelist_id).currency_id.id, currency_id, price)
 
             # Compute price from supplier pricelist which are in Supplier Information
 
=== modified file 'product/report/pricelist.py'
--- product/report/pricelist.py	2011-01-14 00:11:01 +0000
+++ product/report/pricelist.py	2011-02-16 05:24:17 +0000
@@ -90,7 +90,7 @@
                         pro.append('<pro name="%s" >' % (x['name']))
                     temp = []
                     for q in qty:
-                        price_dict = pool.get('product.pricelist').price_get(cr, uid, [price_list_id], x['id'], q)
+                        price_dict = pool.get('product.pricelist').price_get(cr, uid, [price_list_id], x['id'], q, context=context)
                         if price_dict[price_list_id]:
                             price = price_dict[price_list_id]
                         else:
 
=== modified file 'product_margin/product_margin_view.xml'
--- product_margin/product_margin_view.xml	2011-01-14 00:11:01 +0000
+++ product_margin/product_margin_view.xml	2011-02-16 05:24:17 +0000
@@ -80,6 +80,9 @@
                     <field name="expected_margin"/>
                     <field name="total_margin_rate"  widget="progressbar"/>
                     <field name="expected_margin_rate" widget="progressbar"/>
+                    <field name="categ_id" invisible="1"/>
+                    <field name="uom_id" invisible="1"/>
+                    <field name="type" invisible="1"/>
             </tree>
             </field>
         </record>
 
=== modified file 'project_mrp/project_procurement.py'
--- project_mrp/project_procurement.py	2011-01-14 00:11:01 +0000
+++ project_mrp/project_procurement.py	2011-02-16 05:24:17 +0000
@@ -37,7 +37,7 @@
             self.write(cr, uid, [procurement.id], {'state': 'running'})
             planned_hours = procurement.product_qty
             task_id = self.pool.get('project.task').create(cr, uid, {
-                'name': '%s:%s' % (procurement.origin or '', procurement.name),
+                'name': '%s:%s' % (procurement.origin or '', procurement.product_id.name),
                 'date_deadline': procurement.date_planned,
                 'planned_hours':planned_hours,
                 'remaining_hours': planned_hours,
 
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-02-14 11:45:07 +0000
+++ purchase/purchase.py	2011-02-16 05:24:17 +0000
@@ -170,7 +170,7 @@
         'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True),
         'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True,
             states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},domain="[('partner_id', '=', partner_id)]"),
-        'dest_address_id':fields.many2one('res.partner.address', 'Destination Address',
+        'dest_address_id':fields.many2one('res.partner.address', 'Destination Address', domain="[('partner_id', '!=', False)]",
             states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},
             help="Put an address if you want to deliver directly from the supplier to the customer." \
                 "In this case, it will remove the warehouse link and set the customer location."
@@ -665,7 +665,6 @@
                 'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}}
         res = {}
         prod= self.pool.get('product.product').browse(cr, uid, product)
-
         product_uom_pool = self.pool.get('product.uom')
         lang=False
         if partner_id:
@@ -681,6 +680,11 @@
             date_order = time.strftime('%Y-%m-%d')
         qty = qty or 1.0
         seller_delay = 0
+        if uom:
+            uom1_cat = prod.uom_id.category_id.id
+            uom2_cat = product_uom_pool.browse(cr, uid, uom).category_id.id
+            if uom1_cat != uom2_cat:
+                uom = False
 
         prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1]
         res = {}
@@ -707,14 +711,13 @@
             'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id),
             'date_planned': date_planned or dt,'notes': notes or prod.description_purchase,
             'product_qty': qty,
-            'product_uom': uom}})
+            'product_uom': prod.uom_id.id}})
         domain = {}
 
         taxes = self.pool.get('account.tax').browse(cr, uid,map(lambda x: x.id, prod.supplier_taxes_id))
         fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
         res['value']['taxes_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
-
-        res2 = self.pool.get('product.uom').read(cr, uid, [uom], ['category_id'])
+        res2 = self.pool.get('product.uom').read(cr, uid, [prod.uom_id.id], ['category_id'])
         res3 = prod.uom_id.category_id.id
         domain = {'product_uom':[('category_id','=',res2[0]['category_id'][0])]}
         if res2[0]['category_id'][0] != res3:
 
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2011-01-18 13:33:35 +0000
+++ purchase/purchase_view.xml	2011-02-16 05:24:17 +0000
@@ -12,7 +12,7 @@
             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"/>
 
@@ -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"/>
@@ -216,7 +216,7 @@
                             <field name="date_approve"/>
                         	<separator string="Invoices" colspan="4"/>
                         	<newline/>
-                        	<field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4"/>
+                        	<field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4" context="{'type':'in_invoice'}"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2011-01-24 16:13:46 +0000
+++ stock/stock.py	2011-02-16 05:24:17 +0000
@@ -1166,8 +1166,7 @@
             for move in pick.move_lines:
                 if move.state in ('done', 'cancel'):
                     continue
-                partial_data = partial_datas.get('move%s'%(move.id), False)
-                assert partial_data, _('Missing partial picking data for move #%s') % (move.id)
+                partial_data = partial_datas.get('move%s'%(move.id), {})
                 product_qty = partial_data.get('product_qty',0.0)
                 move_product_qty[move.id] = product_qty
                 product_uom = partial_data.get('product_uom',False)
@@ -1248,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 = {
@@ -1463,7 +1462,7 @@
     _description = "Stock Move"
     _order = 'date_expected desc, id'
     _log_create = False
-    
+
     def action_partial_move(self, cr, uid, ids, context=None):
         if context is None: context = {}
         partial_id = self.pool.get("stock.partial.move").create(
@@ -1481,7 +1480,7 @@
             'domain': '[]',
             'context': context
         }
-        
+
 
     def name_get(self, cr, uid, ids, context=None):
         res = []
@@ -1855,11 +1854,6 @@
         """
         moves = self.browse(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'confirmed'})
-        res_obj = self.pool.get('res.company')
-        location_obj = self.pool.get('stock.location')
-        move_obj = self.pool.get('stock.move')
-        wf_service = netsvc.LocalService("workflow")
-
         self.create_chained_picking(cr, uid, moves, context)
         return []
 
@@ -1886,6 +1880,14 @@
         @return: True
         """
         self.write(cr, uid, ids, {'state': 'confirmed'})
+
+        # fix for bug lp:707031
+        # called write of related picking because changing move availability does
+        # not trigger workflow of picking in order to change the state of picking
+        wf_service = netsvc.LocalService('workflow')
+        for move in self.browse(cr, uid, ids, context):
+            if move.picking_id:
+                wf_service.trg_write(uid, 'stock.picking', move.picking_id.id, cr)
         return True
 
     #
@@ -2135,7 +2137,7 @@
             prodlot_id = partial_datas and partial_datas.get('move%s_prodlot_id' % (move.id), False)
             if prodlot_id:
                 self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id}, context=context)
-            if move.state not in ('confirmed','done'):
+            if move.state not in ('confirmed','done','assigned'):
                 self.action_confirm(cr, uid, move_ids, context=context)
 
         self.write(cr, uid, move_ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
 
=== modified file 'stock/wizard/stock_invoice_onshipping.py'
--- stock/wizard/stock_invoice_onshipping.py	2011-01-17 08:00:48 +0000
+++ stock/wizard/stock_invoice_onshipping.py	2011-02-16 05:24:17 +0000
@@ -115,7 +115,7 @@
         if context is None:
             context = {}
         picking_pool = self.pool.get('stock.picking')
-        onshipdata_obj = self.read(cr, uid, ids, ['journal_id', 'group', 'invoice_date'])
+        onshipdata_obj = self.read(cr, uid, ids, ['journal_id', 'group', 'invoice_date'], context=context)
         if context.get('new_picking', False):
             onshipdata_obj['id'] = onshipdata_obj.new_picking
             onshipdata_obj[ids] = onshipdata_obj.new_picking
@@ -127,7 +127,7 @@
         res = picking_pool.action_invoice_create(cr, uid, active_ids,
               journal_id = onshipdata_obj[0]['journal_id'],
               group = onshipdata_obj[0]['group'],
-              type = None,
+              type = context.get('inv_type'),
               context=context)
         return res
 
 
=== modified file 'stock/wizard/stock_location_product.py'
--- stock/wizard/stock_location_product.py	2011-01-14 00:11:01 +0000
+++ stock/wizard/stock_location_product.py	2011-02-16 05:24:17 +0000
@@ -39,7 +39,7 @@
          @return: Invoice type
         """
         mod_obj = self.pool.get('ir.model.data')
-        for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
+        for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date'], context=context):
             return {
                 'name': False, 
                 'view_type': 'form', 
 
=== modified file 'stock/wizard/stock_move.py'
--- stock/wizard/stock_move.py	2011-01-14 00:11:01 +0000
+++ stock/wizard/stock_move.py	2011-02-16 05:24:17 +0000
@@ -21,34 +21,6 @@
 
 from osv import fields, osv
 
-class stock_move_track(osv.osv_memory):
-    _name = "stock.move.track"
-    _description = "Track moves"
-
-    _columns = {
-        'tracking_prefix': fields.char('Tracking prefix', size=64),
-        'quantity': fields.float("Quantity per lot")
-    }
-
-    _defaults = {
-        'quantity': lambda *x: 1
-    }
-
-    def track_lines(self, cr, uid, ids, context=None):
-        """ To track stock moves lines
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: An ID or list of IDs if we want more than one
-        @param context: A standard dictionary
-        @return:
-        """
-        datas = self.read(cr, uid, ids)[0]
-        move_obj = self.pool.get('stock.move')
-        move_obj._track_lines(cr, uid, context['active_id'], datas, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-stock_move_track()
 
 class stock_move_consume(osv.osv_memory):
     _name = "stock.move.consume"
 
=== modified file 'stock/wizard/stock_partial_picking.py'
--- stock/wizard/stock_partial_picking.py	2011-01-27 10:53:33 +0000
+++ stock/wizard/stock_partial_picking.py	2011-02-16 05:24:17 +0000
@@ -67,8 +67,9 @@
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
                     continue
-                result.append(self.__create_partial_picking_memory(m, pick_type))
-
+                move_memory = self.__create_partial_picking_memory(m, pick_type)
+                if move_memory:
+                    result.append(move_memory)
         if 'product_moves_in' in fields:
             res.update({'product_moves_in': result})
         if 'product_moves_out' in fields:
@@ -124,12 +125,27 @@
             'prodlot_id' : picking.prodlot_id.id, 
             'move_id' : picking.id, 
         }
-    
+        
         if pick_type == 'in':
             move_memory.update({
                 'cost' : picking.product_id.standard_price, 
                 'currency' : picking.product_id.company_id and picking.product_id.company_id.currency_id and picking.product_id.company_id.currency_id.id or False, 
             })
+            
+        if pick_type == 'out':
+            type = picking.picking_id.move_type
+            qty_avl =  picking.product_id.qty_available   
+            if type == 'direct' :
+                if qty_avl <= 0.0 and  picking.state != 'assigned':
+                    move_memory = {}
+                if picking.product_qty > qty_avl and qty_avl > 0.0:
+                     move_memory.update({
+                    'quantity' : qty_avl, 
+                    })
+                if picking.state == 'assigned':
+                    move_memory.update({
+                    'quantity' : picking.product_qty, 
+                    })
         return move_memory
 
     def do_partial(self, cr, uid, ids, context=None):
 
=== modified file 'stock/wizard/stock_return_picking.py'
--- stock/wizard/stock_return_picking.py	2011-01-18 13:41:41 +0000
+++ stock/wizard/stock_return_picking.py	2011-02-16 05:24:17 +0000
@@ -151,7 +151,7 @@
         wf_service = netsvc.LocalService("workflow")
     
         pick = pick_obj.browse(cr, uid, record_id, context=context)
-        data = self.read(cr, uid, ids[0])
+        data = self.read(cr, uid, ids[0], context=context)
         new_picking = None
         date_cur = time.strftime('%Y-%m-%d %H:%M:%S')