Amit Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-manufacturing-view-imp-kjo into
lp:openobject-addons.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
Aline (OpenERP) (apr-tinyerp)
Stephane Wirtel (OpenERP) (stephane-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-manufacturing-view-imp-kjo/+merge/112329
Hello ,
Improved all views of Manufacturing Application which are defined in this pad :
http://pad.openerp.com/internalv61-project-task-3687-1CUXCRY8
Thanks,
Amit
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-manufacturing-view-imp-kjo/+merge/112329
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-manufacturing-view-imp-kjo.
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py 2012-05-22 16:10:55 +0000
+++ mrp/mrp.py 2012-06-27 11:16:23 +0000
@@ -472,9 +472,9 @@
'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}),
'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]}, 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, ondelete="restrict",
+ '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_prod_id': fields.many2one('stock.move', 'Product Move', 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)]}),
'move_lines2': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products', domain=[('state','in', ('done', 'cancel'))]),
'move_created_ids': fields.one2many('stock.move', 'production_id', 'Products to Produce', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
@@ -1112,9 +1112,9 @@
_columns = {
'name': fields.char('Name', size=64, required=True),
'product_id': fields.many2one('product.product', 'Product', required=True),
- 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+ 'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
- 'product_uos_qty': fields.float('Product UOS Qty'),
+ 'product_uos_qty': fields.float('Product UOS Quantity'),
'product_uos': fields.many2one('product.uom', 'Product UOS'),
'production_id': fields.many2one('mrp.production', 'Production Order', select=True),
}
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2012-06-22 13:05:06 +0000
+++ mrp/mrp_view.xml 2012-06-27 11:16:23 +0000
@@ -32,7 +32,7 @@
</field>
</record>
<record id="mrp_property_group_action" model="ir.actions.act_window">
- <field name="name">Property Groups</field>
+ <field name="name">Property Group</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.property.group</field>
<field name="view_type">form</field>
@@ -114,12 +114,14 @@
action="mrp_property_action"
id="menu_mrp_property_action"
groups="product.group_mrp_properties"
- parent="menu_mrp_property"/>
+ parent="menu_mrp_configuration"
+ sequence="30" />
<menuitem
action="mrp_property_group_action"
- parent="menu_mrp_property"
- groups="product.group_mrp_properties"
- id="menu_mrp_property_group_action"/>
+ parent="menu_mrp_configuration"
+ groups="base.group_no_one"
+ id="menu_mrp_property_group_action"
+ sequence="35" />
<!--
Work Centers
@@ -144,38 +146,44 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Work Center" version="7.0">
- <group col="4">
- <field name="name"/>
- <field name="code"/>
- <field name="active"/>
- <field name="resource_type"/>
- <field name="calendar_id" widget="selection"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
- </group>
- <notebook>
- <page string="General Information">
- <group>
- <group string="Capacity Information">
- <field name="time_efficiency"/>
- <field name="capacity_per_cycle"/>
- <field name="time_cycle" widget="float_time"/>
- <field name="time_start" widget="float_time"/>
- <field name="time_stop" widget="float_time"/>
- </group>
- <group string="Costing Information">
- <field name="product_id" on_change="on_change_product_cost(product_id)"/>
- <field name="costs_hour"/>
- <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
- <field name="costs_cycle"/>
- <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
- <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
- <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
- </group>
- </group>
- <label for="note"/>
- <field name="note"/>
- </page>
- </notebook>
+ <sheet>
+ <group col="4">
+ <group>
+ <field name="name"/>
+ <field name="resource_type"/>
+ <field name="calendar_id" widget="selection"/>
+ </group>
+ <group>
+ <field name="code"/>
+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ <field name="active"/>
+ </group>
+ </group>
+ <notebook>
+ <page string="General Information">
+ <group>
+ <group string="Capacity Information">
+ <field name="time_efficiency"/>
+ <field name="capacity_per_cycle"/>
+ <field name="time_cycle" widget="float_time"/>
+ <field name="time_start" widget="float_time"/>
+ <field name="time_stop" widget="float_time"/>
+ </group>
+ <group string="Costing Information">
+ <field name="product_id" on_change="on_change_product_cost(product_id)"/>
+ <field name="costs_hour"/>
+ <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
+ <field name="costs_cycle"/>
+ <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
+ <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+ <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+ </group>
+ </group>
+ <label for="note"/>
+ <field name="note"/>
+ </page>
+ </notebook>
+ </sheet>
</form>
</field>
</record>
@@ -231,16 +239,18 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Routing Work Centers" version="7.0">
- <group col="4" string="General Information">
- <field colspan="4" name="name"/>
- <field name="sequence"/>
- <field name="workcenter_id"/>
- <field name="cycle_nbr"/>
- <field name="hour_nbr" widget="float_time"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
- </group>
- <label for="note"/>
- <field name="note"/>
+ <sheet>
+ <group col="4" string="General Information">
+ <field colspan="4" name="name"/>
+ <field name="sequence"/>
+ <field name="workcenter_id"/>
+ <field name="cycle_nbr"/>
+ <field name="hour_nbr" widget="float_time"/>
+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+ </group>
+ <label for="note"/>
+ <field name="note"/>
+ </sheet>
</form>
</field>
</record>
@@ -251,21 +261,26 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Routing" version="7.0">
- <group col="4">
- <field name="name"/>
- <field name="code"/>
- <field name="active"/>
- <field name="location_id"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
- </group>
- <notebook>
- <page string="Work Center Operations">
- <field name="workcenter_lines"/>
- </page>
- <page string="Notes">
- <field name="note"/>
- </page>
- </notebook>
+ <sheet>
+ <group col="4">
+ <group>
+ <field name="name"/>
+ <field name="code"/>
+ </group>
+ <group>
+ <field name="location_id"/>
+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+ <field name="active"/>
+ </group>
+ </group>
+ <notebook>
+ <page string="Work Center Operations">
+ <field name="workcenter_lines"/>
+ <label string="Notes"/>
+ <field name="note"/>
+ </page>
+ </notebook>
+ </sheet>
</form>
</field>
</record>
@@ -340,8 +355,13 @@
<group>
<field name="type"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
- <field name="product_uos_qty" groups="product.group_uos" />
- <field name="product_uos" groups="product.group_uos"/>
+ <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
+ <div groups="product.group_uos" >
+ <field name="product_uos_qty"
+ class="oe_inline"/>
+ <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
+ <field name="product_uos" class="oe_inline"/>
+ </div>
</group>
</group>
<notebook>
@@ -349,7 +369,7 @@
<field name="bom_lines" widget="one2many_list">
<tree string="Components" editable="bottom">
<field name="product_id" on_change="onchange_product_id(product_id, name)"/>
- <field name="product_qty"/>
+ <field name="product_qty" string="Product Quantity"/>
<field name="product_uom"/>
<field name="name" invisible="1"/>
<field name="date_start"/>
@@ -444,7 +464,7 @@
<field name="code"/>
<field name="product_id" string="Component Product"/>
<field name="bom_id"/>
- <field name="product_qty"/>
+ <field name="product_qty" string="Product Quantity"/>
<field name="product_uom"/>
<field name="type"/>
<field name="method"/>
@@ -483,7 +503,7 @@
<menuitem
action="mrp_bom_form_action2"
id="menu_mrp_bom_form_action2"
- parent="menu_mrp_bom"
+ parent="menu_mrp_configuration"
sequence="20"/>
<record id="action2" model="ir.actions.act_window">
@@ -635,93 +655,111 @@
</group>
<group>
<field name="user_id"/>
- <field name="product_uos_qty" groups="product.group_uos"/>
- <field name="product_uos" groups="product.group_uos"/>
+ <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
+ <div groups="product.group_uos">
+ <field name="product_uos_qty" class="oe_inline"/>
+ <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
+ <field name="product_uos" class="oe_inline"/>
+ </div>
</group>
</group>
<notebook>
<page string="Consumed Products">
<group col="4">
<group>
+ <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
+ </group>
+ <group>
<field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
<field name="location_dest_id" domain="[('usage','=','internal')]"/>
</group>
- <group>
- <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
- </group>
- <field name="move_lines" domain="[('state','<>', ('done', 'cancel'))]">
- <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
- <field name="product_id" />
- <field name="product_qty" string="Qty"/>
- <field name="product_uom" string="Unit of Measure"/>
- <field name="location_id" string="Source Loc."/>
- <field name="state" invisible="1"/>
- <button name="%(stock.move_consume)d"
- string="Consume Products" type="action"
- icon="gtk-go-forward" context="{'consume': True}"
- states="draft,waiting,confirmed,assigned" />
- <button
- name="%(stock.track_line)d"
- string="Split in Serial Numbers"
- type="action" icon="gtk-justify-fill"
- states="draft,waiting,confirmed,assigned" />
- <button name="%(stock.move_scrap)d"
- string="Scrap Products" type="action"
- icon="gtk-convert" context="{'scrap': True}"
- states="draft,waiting,confirmed,assigned"/>
- </tree>
- </field>
- <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]">
- <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
- <field name="product_id" readonly="1"/>
- <field name="product_qty" readonly="1" string="Qty"/>
- <field name="product_uom" readonly="1" string="Unit of Measure"/>
- <field name="prodlot_id" context="{'product_id': product_id}"/>
- <field name="state" invisible="1"/>
- <field name="scrapped" invisible="1"/>
- <button
- name="%(stock.move_scrap)d"
- string="Scrap Products" type="action"
- icon="gtk-convert"
- states="done,cancel"/>
- </tree>
- </field>
+ </group>
+ <group col="4">
+ <group col="1" colspan="2">
+ <separator string="Products to Consume"/>
+ <field name="move_lines" domain="[('state','<>', ('done', 'cancel'))]" nolabel="1">
+ <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
+ <field name="product_id" />
+ <field name="product_qty" string="Quantity"/>
+ <field name="product_uom" string="Unit of Measure"/>
+ <field name="location_id" string="Source Loc."/>
+ <field name="state" invisible="1"/>
+ <button name="%(stock.move_consume)d"
+ string="Consume Products" type="action"
+ icon="gtk-go-forward" context="{'consume': True}"
+ states="draft,waiting,confirmed,assigned" />
+ <button
+ name="%(stock.track_line)d"
+ string="Split in Serial Numbers"
+ type="action" icon="gtk-justify-fill"
+ states="draft,waiting,confirmed,assigned" />
+ <button name="%(stock.move_scrap)d"
+ string="Scrap Products" type="action"
+ icon="gtk-convert" context="{'scrap': True}"
+ states="draft,waiting,confirmed,assigned"/>
+ </tree>
+ </field>
+ </group>
+ <group col="1" colspan="2">
+ <separator string="Consumed Product"/>
+ <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
+ <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
+ <field name="product_id" readonly="1"/>
+ <field name="product_qty" readonly="1"/>
+ <field name="product_uom" readonly="1" string="Unit of Measure"/>
+ <field name="prodlot_id" context="{'product_id': product_id}"/>
+ <field name="state" invisible="1"/>
+ <field name="scrapped" invisible="1"/>
+ <button
+ name="%(stock.move_scrap)d"
+ string="Scrap Products" type="action"
+ icon="gtk-convert"
+ states="done,cancel"/>
+ </tree>
+ </field>
+ </group>
</group>
</page>
<page string="Finished Products">
- <group>
- <field name="move_created_ids" domain="[('state','<>', ('done', 'cancel'))]">
- <tree string="Products to Finish">
- <field name="product_id" />
- <field name="product_qty" string="Qty"/>
- <field name="product_uom" string="Unit of Measure"/>
- <field name="state" invisible="1"/>
- <button name="%(stock.action_partial_move_server)d"
- string="Partial"
- type="action" states="confirmed,assigned"
- icon="gtk-justify-fill"/>
- <button name="%(stock.move_scrap)d"
- string="Scrap Products" type="action"
- icon="gtk-convert" context="{'scrap': True}"
- states="draft,waiting,confirmed,assigned" />
- </tree>
- </field>
- <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]">
- <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
- <field name="product_id" readonly="1"/>
- <field name="product_qty" readonly="1" string="Qty"/>
- <field name="product_uom" readonly="1" string="Unit of Measure"/>
- <field name="location_dest_id" readonly="1" string="Destination Loc." widget="selection"/>
- <field name="prodlot_id" context="{'product_id': product_id}"/>
- <field name="scrapped" invisible="1"/>
- <field name="state" invisible="1"/>
- <button name="%(stock.track_line)d"
- string="Split in Serial Numbers" type="action" icon="gtk-justify-fill" states="done,cancel"/>
- <button name="%(stock.move_scrap)d"
- string="Scrap Products" type="action" icon="gtk-convert"
- states="done,cancel" />
- </tree>
- </field>
+ <group col="4">
+ <group col="1" colspan="2">
+ <separator string="Products to Produce"/>
+ <field name="move_created_ids" domain="[('state','<>', ('done', 'cancel'))]" nolabel="1">
+ <tree string="Products to Finish">
+ <field name="product_id" />
+ <field name="product_qty"/>
+ <field name="product_uom" string="Unit of Measure"/>
+ <field name="state" invisible="1"/>
+ <button name="%(stock.action_partial_move_server)d"
+ string="Partial"
+ type="action" states="confirmed,assigned"
+ icon="gtk-justify-fill"/>
+ <button name="%(stock.move_scrap)d"
+ string="Scrap Products" type="action"
+ icon="gtk-convert" context="{'scrap': True}"
+ states="draft,waiting,confirmed,assigned" />
+ </tree>
+ </field>
+ </group>
+ <group col="1" colspan="2">
+ <separator string="Produced Products"/>
+ <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
+ <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
+ <field name="product_id" readonly="1"/>
+ <field name="product_qty" readonly="1"/>
+ <field name="product_uom" readonly="1" string="Unit of Measure"/>
+ <field name="location_dest_id" readonly="1" string="Destination Loc." widget="selection"/>
+ <field name="prodlot_id" context="{'product_id': product_id}"/>
+ <field name="scrapped" invisible="1"/>
+ <field name="state" invisible="1"/>
+ <button name="%(stock.track_line)d"
+ string="Split in Serial Numbers" type="action" icon="gtk-justify-fill" states="done,cancel"/>
+ <button name="%(stock.move_scrap)d"
+ string="Scrap Products" type="action" icon="gtk-convert"
+ states="done,cancel" />
+ </tree>
+ </field>
+ </group>
</group>
</page>
<page string="Work Orders">
@@ -732,7 +770,7 @@
<form string="Production Work Centers" version="7.0">
<group col="4">
<field colspan="4" name="name"/>
- <field name="workcenter_id" widget="selection"/>
+ <field name="workcenter_id"/>
<field name="sequence"/>
<field name="cycle"/>
<field name="hour"/>
@@ -741,7 +779,7 @@
<tree string="Production Work Centers">
<field name="sequence"/>
<field name="name"/>
- <field name="workcenter_id" widget="selection"/>
+ <field name="workcenter_id"/>
<field name="cycle"/>
<field name="hour"/>
</tree>
@@ -755,12 +793,16 @@
</page>
<page string="Extra Information">
<group col="4">
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ <group>
<field name="priority"/>
<field name="date_start"/>
<field name="date_finished"/>
- <field name="picking_id"/>
- <field name="move_prod_id"/>
+ </group>
+ <group>
+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ <field name="picking_id"/>
+ <field name="move_prod_id"/>
+ </group>
</group>
</page>
</notebook>
@@ -959,7 +1001,7 @@
<!-- Menu for Resource for MRP-->
<record id="mrp_workcenter_action" model="ir.actions.act_window">
- <field name="name">Work Centers</field>
+ <field name="name">Work Center</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.workcenter</field>
<field name="view_type">form</field>
@@ -969,7 +1011,7 @@
</record>
<menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
- <menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" groups="mrp.group_mrp_routings" parent="mrp.menu_mrp_bom" sequence="25"/>
+ <menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" groups="mrp.group_mrp_routings" parent="mrp.menu_mrp_configuration" sequence="25"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1" groups="base.group_no_one"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1" groups="base.group_no_one"/>
=== modified file 'mrp_operations/mrp_operations_view.xml'
--- mrp_operations/mrp_operations_view.xml 2012-06-22 11:12:51 +0000
+++ mrp_operations/mrp_operations_view.xml 2012-06-27 11:16:23 +0000
@@ -8,17 +8,16 @@
<field name="type">form</field>
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
<field name="arch" type="xml">
- <xpath expr="//field[@name='workcenter_lines']/form//field[@name='hour']" position="after">
- <group colspan="8" col="8">
- <separator colspan="8"/>
- <field name="state"/>
+ <xpath expr="//field[@name='workcenter_lines']/form//field[@name='name']" position="before">
+ <header colspan="8">
+ <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
<button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
<button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
- <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
<button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
<button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
- </group>
+ <field name="state" widget="statusbar"/>
+ </header>
</xpath>
</field>
</record>
@@ -80,7 +79,7 @@
<sheet string="Work Orders">
<group col="4">
<field colspan="4" name="name"/>
- <field name="workcenter_id" widget="selection"/>
+ <field name="workcenter_id"/>
<field name="production_id"/>
<field name="production_state"/>
<field name="sequence"/>
@@ -351,7 +350,7 @@
<field name="model">mrp.production</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <field name="priority" position="after">
+ <field name="date_finished" position="after">
<field name="allow_reorder"/>
</field>
</field>
=== modified file 'sale_mrp/sale_mrp.py'
--- sale_mrp/sale_mrp.py 2011-07-01 23:41:24 +0000
+++ sale_mrp/sale_mrp.py 2012-06-27 11:16:23 +0000
@@ -70,8 +70,8 @@
return res
_columns = {
- 'sale_name': fields.function(_ref_calc, multi='sale_name', type='char', string='Sales Name', help='Indicate the name of sales order.'),
- 'sale_ref': fields.function(_ref_calc, multi='sale_name', type='char', string='Sales Reference', help='Indicate the Customer Reference from sales order.'),
+ 'sale_name': fields.function(_ref_calc, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sales order.'),
+ 'sale_ref': fields.function(_ref_calc, multi='sale_name', type='char', string='Sale Reference', help='Indicate the Customer Reference from sales order.'),
}
mrp_production()
=== modified file 'sale_mrp/sale_mrp_view.xml'
--- sale_mrp/sale_mrp_view.xml 2012-05-22 10:37:54 +0000
+++ sale_mrp/sale_mrp_view.xml 2012-06-27 11:16:23 +0000
@@ -8,9 +8,11 @@
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
<field name="type">form</field>
<field name="arch" type="xml">
- <xpath expr="//field[@name='move_prod_id']" position="after">
+ <xpath expr="//field[@name='company_id']" position="after">
+ <field name="sale_ref"/>
+ </xpath>
+ <xpath expr="//field[@name='sale_ref']" position="after">
<field name="sale_name"/>
- <field name="sale_ref"/>
</xpath>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
