Divyesh Makwana(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-902112-mdi into
lp:openobject-addons.
Requested reviews:
Divyesh Makwana(OpenERP) (mdi-openerp)
Purnendu Singh (OpenERP) (psi-tinyerp)
Mustufa Rangwala (Open ERP) (mra-tinyerp)
Related bugs:
Bug #902112 in OpenERP Addons: "sale order line : extra info not in well
format"
https://bugs.launchpad.net/openobject-addons/+bug/902112
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-902112-mdi/+merge/86202
Hello Sir,
I have fix the issue: https://bugs.launchpad.net/openobject-addons/+bug/902112
"sale order line : extra info not in well format".
Thanks and Regards,
Divyesh Makwana(MDI)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-902112-mdi/+merge/86202
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-902112-mdi.
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2011-12-16 13:03:46 +0000
+++ mrp/mrp_view.xml 2011-12-19 09:12:22 +0000
@@ -14,23 +14,6 @@
parent="base.menu_mrp_root"
sequence="5" />
- <!--
- Property / Property Group
- -->
-
- <record id="mrp_property_group_form_view" model="ir.ui.view">
- <field name="name">mrp.property.group.form</field>
- <field name="model">mrp.property.group</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Properties categories">
- <separator colspan="4" string="Property Group"/>
- <field colspan="4" name="name" select="1" nolabel="1"/>
- <separator colspan="4" string="Description"/>
- <field colspan="4" name="description" nolabel="1"/>
- </form>
- </field>
- </record>
<record id="mrp_property_group_action" model="ir.actions.act_window">
<field name="name">Property Groups</field>
<field name="type">ir.actions.act_window</field>
@@ -39,6 +22,7 @@
<field name="view_mode">tree,form</field>
<field name="help">Define specific property groups that can be assigned to the properties of your bill of materials.</field>
</record>
+
<menuitem
id="menu_mrp_configuration"
name="Configuration"
@@ -46,52 +30,6 @@
groups="group_mrp_manager"
sequence="50" />
- <record id="mrp_property_tree_view" model="ir.ui.view">
- <field name="name">mrp.property.tree</field>
- <field name="model">mrp.property</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Properties">
- <field name="name"/>
- <field name="composition"/>
- <field name="group_id"/>
- </tree>
- </field>
- </record>
- <record id="mrp_property_form_view" model="ir.ui.view">
- <field name="name">mrp.property.form</field>
- <field name="model">mrp.property</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Properties">
- <field colspan="4" name="name" select="1"/>
- <field name="group_id" select="1"/>
- <field name="composition" select="1"/>
- <separator colspan="4" string="Description"/>
- <field colspan="4" name="description" nolabel="1"/>
- </form>
- </field>
- </record>
-
- <record id="view_mrp_property_search" model="ir.ui.view">
- <field name="name">mrp.property.search</field>
- <field name="model">mrp.property</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Search">
- <group>
- <field name="name"/>
- <field name="composition"/>
- <field name="group_id" widget="selection" />
- </group>
- <newline/>
- <group expand="0" string="Group By...">
- <filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
- </group>
- </search>
- </field>
- </record>
-
<record id="mrp_property_action" model="ir.actions.act_window">
<field name="name">Properties</field>
@@ -99,7 +37,7 @@
<field name="res_model">mrp.property</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
- <field name="search_view_id" ref="view_mrp_property_search"/>
+ <field name="search_view_id" ref="procurement.view_mrp_property_search"/>
<field name="help">The Properties in OpenERP are used to select the right bill of materials for manufacturing a product when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will automatically select the BoM to use according the the needs.</field>
</record>
<menuitem name="Master Bill of Materials"
=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml 2011-10-16 01:28:00 +0000
+++ procurement/procurement_view.xml 2011-12-19 09:12:22 +0000
@@ -1,11 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
+
+ <!--
+ Property / Property Group
+ -->
+ <record id="mrp_property_group_form_view" model="ir.ui.view">
+ <field name="name">mrp.property.group.form</field>
+ <field name="model">mrp.property.group</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Properties categories">
+ <separator colspan="4" string="Property Group"/>
+ <field colspan="4" name="name" select="1" nolabel="1"/>
+ <separator colspan="4" string="Description"/>
+ <field colspan="4" name="description" nolabel="1"/>
+ </form>
+ </field>
+ </record>
+
+ <record id="mrp_property_tree_view" model="ir.ui.view">
+ <field name="name">mrp.property.tree</field>
+ <field name="model">mrp.property</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Properties">
+ <field name="name"/>
+ <field name="composition"/>
+ <field name="group_id"/>
+ </tree>
+ </field>
+ </record>
+
+ <record id="mrp_property_form_view" model="ir.ui.view">
+ <field name="name">mrp.property.form</field>
+ <field name="model">mrp.property</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Properties">
+ <field colspan="4" name="name" select="1"/>
+ <field name="group_id" select="1"/>
+ <field name="composition" select="1"/>
+ <separator colspan="4" string="Description"/>
+ <field colspan="4" name="description" nolabel="1"/>
+ </form>
+ </field>
+ </record>
+
+ <record id="view_mrp_property_search" model="ir.ui.view">
+ <field name="name">mrp.property.search</field>
+ <field name="model">mrp.property</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search">
+ <group>
+ <field name="name"/>
+ <field name="composition"/>
+ <field name="group_id" widget="selection" />
+ </group>
+ <newline/>
+ <group expand="0" string="Group By...">
+ <filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
+ </group>
+ </search>
+ </field>
+ </record>
+
<!--
Procurement
-->
-
<record id="procurement_tree_view" model="ir.ui.view">
<field name="name">procurement.order.tree</field>
<field name="model">procurement.order</field>
_______________________________________________
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
