pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] product_uom => product_uom_id

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20130806071349-z1ilxrmto6mokb95
This commit is contained in:
Quentin (OpenERP)
2013-08-06 09:13:49 +02:00
parent ee3af88d34 dab5e349ab
commit ae104f5987
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/stock_demo.xml
+17 -17
View File
@@ -55,105 +55,105 @@
<record id="stock_inventory_line_1" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_24"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">16.0</field>
<field name="location_id" ref="stock_location_14"/>
</record>
<record model="stock.inventory.line">
<record id="stock_inventory_line_14" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">16.0</field>
<field name="location_id" ref="stock_location_14"/>
</record>
<record model="stock.inventory.line">
<record id="stock_inventory_line_15" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_5"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">8.0</field>
<field name="location_id" ref="stock_location_14"/>
</record>
<record id="stock_inventory_line_2" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_7"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">18.0</field>
<field name="location_id" ref="stock_location_components"/>
</record>
<record id="stock_inventory_line_3" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_6"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">10.0</field>
<field name="location_id" ref="stock_location_components"/>
</record>
<record id="stock_inventory_line_4" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_9"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">22.0</field>
<field name="location_id" ref="stock_location_components"/>
</record>
<record id="stock_inventory_line_5" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_10"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">8.0</field>
<field name="location_id" ref="stock_location_components"/>
</record>
<record id="stock_inventory_line_6" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_11"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">26.0</field>
<field name="location_id" ref="stock_location_components"/>
</record>
<record id="stock_inventory_line_7" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_14"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">32.0</field>
<field name="location_id" ref="stock_location_components"/>
</record>
<record id="stock_inventory_line_8" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_15"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">37.0</field>
<field name="location_id" ref="stock_location_components"/>
</record>
<record id="stock_inventory_line_9" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_17"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">39.0</field>
<field name="location_id" ref="stock_location_components"/>
</record>
<record id="stock_inventory_line_10" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_18"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">45.0</field>
<field name="location_id" ref="stock_location_components"/>
</record>
<record id="stock_inventory_line_11" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">10.0</field>
<field name="location_id" ref="stock_location_components"/>
</record>
<record id="stock_inventory_line_12" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_13"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">2.0</field>
<field name="location_id" ref="stock_location_components"/>
</record>
<record id="stock_inventory_line_13" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_27"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_id" ref="product.product_uom_unit"/>
<field name="inventory_id" ref="stock_inventory_0"/>
<field name="product_qty">80.0</field>
<field name="location_id" ref="stock_location_components"/>
addons/stock/stock_demo.yml
+2 -2
View File
@@ -51,7 +51,7 @@
-
!record {model: stock.inventory.line, id: stock_inventory_line_icecream_lot0}:
product_id: product_icecream
product_uom: product.product_uom_kgm
product_uom_id: product.product_uom_kgm
inventory_id: stock_inventory_icecream
product_qty: 50.0
prod_lot_id: lot_icecream_0
@@ -59,7 +59,7 @@
-
!record {model: stock.inventory.line, id: stock_inventory_line_icecream_lot1}:
product_id: product_icecream
product_uom: product.product_uom_kgm
product_uom_id: product.product_uom_kgm
inventory_id: stock_inventory_icecream
product_qty: 40.0
prod_lot_id: lot_icecream_1
addons/stock/wizard/stock_change_product_qty.py
+1 -1
View File
@@ -95,7 +95,7 @@ class stock_change_product_qty(osv.osv_memory):
'product_qty' : data.new_quantity,
'location_id' : data.location_id.id,
'product_id' : rec_id,
'product_uom' : res_original.uom_id.id,
'product_uom_id' : res_original.uom_id.id,
'prod_lot_id' : data.lot_id.id
}
inventry_line_obj.create(cr , uid, line_data, context=context)
addons/stock/wizard/stock_inventory_line_split.py
+1 -1
View File
@@ -40,7 +40,7 @@ class stock_inventory_line_split(osv.osv_memory):
if 'product_id' in fields:
res.update({'product_id':line.product_id.id})
if 'product_uom' in fields:
res.update({'product_uom': line.product_uom.id})
res.update({'product_uom': line.product_uom_id.id})
if 'qty' in fields:
res.update({'qty': line.product_qty})
return res
addons/stock/wizard/stock_inventory_merge.py
+2 -2
View File
@@ -64,7 +64,7 @@ class stock_inventory_merge(osv.osv_memory):
_('Merging is only allowed on draft inventories.'))
for line in inventory.inventory_line_id:
key = (line.location_id.id, line.product_id.id, line.product_uom.id)
key = (line.location_id.id, line.product_id.id, line.product_uom_id.id)
if key in invent_lines:
invent_lines[key] += line.product_qty
else:
@@ -80,7 +80,7 @@ class stock_inventory_merge(osv.osv_memory):
'inventory_id': new_invent,
'location_id': key[0],
'product_id': key[1],
'product_uom': key[2],
'product_uom_id': key[2],
'product_qty': quantity,
})