odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Corrections in views + calendar fields isinstance + inventory theoretical qty

This commit is contained in:
Josse Colpaert 2014-06-25 15:03:11 +02:00
parent f1afeb680b
commit 12211437f1
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/calendar/calendar.py
View File

@ -745,6 +745,8 @@ class calendar_event(osv.Model):
def _compute(self, cr, uid, ids, fields, arg, context=None):
res = {}
if not isinstance(fields, list):
fields = [fields]
for meeting_id in ids:
res[meeting_id] = {}
attendee = self._find_my_attendee(cr, uid, [meeting_id], context)

2
addons/stock/wizard/stock_change_product_qty.py
View File

@ -99,7 +99,7 @@ class stock_change_product_qty(osv.osv_memory):
'location_id': data.location_id.id,
'product_id': rec_id,
'product_uom_id': res_original.uom_id.id,
'th_qty': th_qty,
'theoretical_qty': th_qty,
'prod_lot_id': data.lot_id.id
}
inventory_line_obj.create(cr , uid, line_data, context=context)

18
addons/stock_account/product_view.xml
View File

@ -31,14 +31,6 @@
<field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
</group>
</xpath>
</field>
</record>
<record id="view_product_standard_price_form" model="ir.ui.view">
<field name="name">product.product.standard.price.form.inherit</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<field name="standard_price" position="replace">
<field name="cost_method" groups="stock_account.group_inventory_valuation"/>
<label string="Cost Price" for="standard_price" align="1.0" groups="base.group_user"/>
@ -49,15 +41,6 @@
class="oe_link" groups="stock_account.group_inventory_valuation"/>
</div>
</field>
</field>
</record>
<record id="view_normal_property_acc_form" model="ir.ui.view">
<field name="name">product.normal.stock.acc.property.form.inherit</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="priority">26</field>
<field name="arch" type="xml">
<xpath expr="//group[@name='properties']" position="before">
<group groups="stock_account.group_inventory_valuation">
<separator string="Inventory Valuation" colspan="4"/>
@ -73,6 +56,7 @@
</group>
<newline/>
</xpath>
</field>
</record>
</data>