Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-social-issue-kjo into
lp:~openerp-dev/openobject-addons/trunk-openchatter.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-social-issue-kjo/+merge/105935
Chatter widget out of the sheet for mrp module
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-social-issue-kjo/+merge/105935
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-openchatter.
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2012-05-16 04:30:48 +0000
+++ mrp/mrp_view.xml 2012-05-16 07:01:19 +0000
@@ -631,8 +631,9 @@
<field name="model">mrp.production</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Manufacturing Orders">
- <group colspan="4" col="7">
+ <form string="Manufacturing Orders" layout="manual">
+ <sheet layout="auto">
+ <group colspan="6" col="7">
<field name="name" string="Reference"/>
<field name="date_planned"/>
<field name="origin"/>
@@ -644,6 +645,8 @@
icon="terp-accessories-archiver+"
name="%(mrp.action_change_production_qty)d"
string="Change Qty" states="ready,confirmed" />
+ </group>
+ <group colspan="2" col="2">
<label string="" colspan="2"/>
<field name="product_uos_qty" groups="product.group_uos"/>
<field name="product_uos" groups="product.group_uos"/>
@@ -786,7 +789,10 @@
<field name="move_prod_id"/>
</page>
</notebook>
+ </sheet>
+ <div class="oe_form_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</form>
</field>
</record>
=== modified file 'mrp_operations/mrp_operations_view.xml'
--- mrp_operations/mrp_operations_view.xml 2012-05-14 11:27:10 +0000
+++ mrp_operations/mrp_operations_view.xml 2012-05-16 07:01:19 +0000
@@ -8,7 +8,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
<field name="arch" type="xml">
- <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/form/field[@name='hour']" position="after">
+ <xpath expr="/form/sheet/notebook/page/field[@name='workcenter_lines']/form/field[@name='hour']" position="after">
<group colspan="8" col="8">
<separator colspan="8"/>
<field name="state"/>
@@ -29,7 +29,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
<field name="arch" type="xml">
- <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
+ <xpath expr="/form/sheet/notebook/page/field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
<field name="state"/>
<button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
<button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
=== modified file 'sale_mrp/sale_mrp_view.xml'
--- sale_mrp/sale_mrp_view.xml 2012-04-25 12:12:23 +0000
+++ sale_mrp/sale_mrp_view.xml 2012-05-16 07:01:19 +0000
@@ -8,7 +8,7 @@
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
<field name="type">form</field>
<field name="arch" type="xml">
- <xpath expr="/form/notebook/page/field[@name='move_prod_id']" position="after">
+ <xpath expr="/form/sheet/notebook/page/field[@name='move_prod_id']" position="after">
<field name="sale_name"/>
<field name="sale_ref"/>
</xpath>
_______________________________________________
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
