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

[MERGE]: Merge with lp:openobject-trunk-dev-addons2

Browse Source 
bzr revid: ksa@tinyerp.co.in-20101213042658-r270tho9sk3sz6l2
This commit is contained in:
ksa (Open ERP)
2010-12-13 09:56:58 +05:30
parent 30bf2bfd4d 4908975a6f
commit 775ea1d3c4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/mrp.py
+2 -2
View File
@@ -53,7 +53,7 @@ class mrp_workcenter(osv.osv):
'costs_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
'costs_general_account_id': fields.many2one('account.account', 'General Account', domain=[('type','<>','view')]),
'resource_id': fields.many2one('resource.resource','Resource', ondelete='cascade', required=True),
'product_id': fields.many2one('product.product','Work Center Product', help="Fill this product to track easily your production costs in the analytic accounting."),
'product_id': fields.many2one('product.product','Workcenter Product', help="Fill this product to track easily your production costs in the analytic accounting."),
}
_defaults = {
'capacity_per_cycle': 1.0,
@@ -333,7 +333,7 @@ class mrp_bom(osv.osv):
result = result + res[0]
result2 = result2 + res[1]
return result, result2
def copy_data(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
addons/mrp/report/mrp_report_view.xml
+4 -4
View File
@@ -7,7 +7,7 @@
<field name="model">report.workcenter.load</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Work Center Load">
<tree string="Work Centers load">
<field name="name"/>
<field name="workcenter_id"/>
<field name="cycle"/>
@@ -21,7 +21,7 @@
<field name="model">report.workcenter.load</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Work Center Load" type="bar">
<graph string="Work Center load" type="bar">
<field name="name"/>
<field name="cycle" operator="+"/>
<field name="hour" operator="+"/>
@@ -29,13 +29,13 @@
</graph>
</field>
</record>
<record id="view_workcenter_load_search" model="ir.ui.view">
<field name="name">report.workcenter.load.search</field>
<field name="model">report.workcenter.load</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Work Center Load">
<search string="Work Center load">
<field name="name"/>
<field name="workcenter_id" widget="selection"/>
</search>