ajay javiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons7-bom-aja into
lp:~openerp-dev/openobject-addons/trunk-addons7.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons7-bom-aja/+merge/122190
Hello,
remove revision tab and all related field and add open chatter in the bottom as
a replacement.
Thank You
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons7-bom-aja/+merge/122190
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons7.
=== modified file 'mrp/i18n/mrp.pot'
--- mrp/i18n/mrp.pot 2012-08-08 14:46:13 +0000
+++ mrp/i18n/mrp.pot 2012-08-31 05:12:54 +0000
@@ -197,11 +197,6 @@
msgstr ""
#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
-#. module: mrp
#: model:ir.actions.act_window,help:mrp.product_form_config_action
msgid "Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased."
msgstr ""
@@ -436,11 +431,6 @@
msgstr ""
#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
-#. module: mrp
#: help:mrp.workcenter,costs_cycle_account_id:0
#: help:mrp.workcenter,costs_hour_account_id:0
msgid "Complete this only if you want automatic analytic accounting entries on production orders."
@@ -494,11 +484,6 @@
msgstr ""
#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
-#. module: mrp
#: field:report.mrp.inout,value:0
msgid "Stock value"
msgstr ""
@@ -762,11 +747,6 @@
msgstr ""
#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
-#. module: mrp
#: view:mrp.bom:0
#: view:mrp.production:0
msgid "Date"
@@ -1295,11 +1275,6 @@
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
-#. module: mrp
#: help:mrp.production,origin:0
msgid "Reference of the document that generated this production order request."
msgstr ""
@@ -1773,12 +1748,6 @@
msgstr ""
#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
-#. module: mrp
#: model:ir.model,name:mrp.model_report_mrp_inout
#: view:report.mrp.inout:0
msgid "Stock value variation"
@@ -1796,17 +1765,6 @@
msgstr ""
#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
-#. module: mrp
#: field:report.mrp.inout,date:0
#: field:report.workcenter.load,name:0
msgid "Week"
@@ -1988,19 +1946,6 @@
msgstr ""
#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
-#. module: mrp
#: view:board.board:0
msgid "Manufacturing board"
msgstr ""
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py 2012-08-15 20:51:43 +0000
+++ mrp/mrp.py 2012-08-31 05:12:54 +0000
@@ -214,7 +214,6 @@
'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True),
'routing_id': fields.many2one('mrp.routing', 'Routing', 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 planning."),
'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
- 'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', string="BoM Hierarchy", type='many2many'),
'company_id': fields.many2one('res.company','Company',required=True),
}
@@ -374,26 +373,6 @@
mrp_bom()
-class mrp_bom_revision(osv.osv):
- _name = 'mrp.bom.revision'
- _description = 'Bill of Material Revision'
- _columns = {
- 'name': fields.char('Modification name', size=64, required=True),
- 'description': fields.text('Description'),
- 'date': fields.date('Modification Date'),
- 'indice': fields.char('Revision', size=16),
- 'last_indice': fields.char('last indice', size=64),
- 'author_id': fields.many2one('res.users', 'Author'),
- 'bom_id': fields.many2one('mrp.bom', 'BoM', select=True),
- }
-
- _defaults = {
- 'author_id': lambda x, y, z, c: z,
- 'date': fields.date.context_today,
- }
-
-mrp_bom_revision()
-
def rounding(f, r):
import math
if not r:
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2012-08-30 13:03:59 +0000
+++ mrp/mrp_view.xml 2012-08-31 05:12:54 +0000
@@ -347,7 +347,7 @@
<form string="Bill of Material" version="7.0">
<label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
<h1>
- <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>:
+ <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>
<field name="product_qty" class="oe_inline"/>
<field name="product_uom" class="oe_inline" groups="product.group_uom"/>
</h1>
@@ -389,9 +389,6 @@
</tree>
</field>
</page>
- <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
- <field name="revision_ids"/>
- </page>
<page string="Properties" groups="product.group_mrp_properties">
<group>
<group>
@@ -411,6 +408,12 @@
<field name="property_ids" widget="many2many_tags"/>
</page>
</notebook>
+ <footer>
+ <div class="oe_chatter">
+ <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+ <field name="message_follower_ids" widget="mail_followers"/>
+ </div>
+ </footer>
</form>
</field>
</record>
@@ -542,35 +545,6 @@
<field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
</record>
- <record id="mrp_bom_revision_tree" model="ir.ui.view">
- <field name="name">mrp.bom.revision</field>
- <field name="model">mrp.bom.revision</field>
- <field name="arch" type="xml">
- <tree string="BoM Revisions">
- <field name="indice"/>
- <field name="author_id"/>
- <field name="date"/>
- <field colspan="4" name="name"/>
- </tree>
- </field>
- </record>
- <record id="mrp_bom_revision_form" model="ir.ui.view">
- <field name="name">mrp.bom.revision</field>
- <field name="model">mrp.bom.revision</field>
- <field name="arch" type="xml">
- <form string="BoM Revisions" version="7.0">
- <group col="4">
- <field name="name"/>
- <field name="indice"/>
- <field name="date"/>
- <field name="author_id" readonly="1"/>
- </group>
- <separator string="Description"/>
- <field name="description"/>
- </form>
- </field>
- </record>
-
<!--
Production Management
-->
=== modified file 'mrp/security/ir.model.access.csv'
--- mrp/security/ir.model.access.csv 2012-06-21 05:16:16 +0000
+++ mrp/security/ir.model.access.csv 2012-08-31 05:12:54 +0000
@@ -3,7 +3,6 @@
access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
access_mrp_bom,mrp.bom,model_mrp_bom,group_mrp_user,1,0,0,0
-access_mrp_bom_revision,mrp.bom.revision,model_mrp_bom_revision,group_mrp_user,1,0,0,0
access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
access_mrp_production_salesman,mrp.production salesman,model_mrp_production,base.group_sale_salesman,1,1,1,0
access_mrp_production_product_line_salesman,mrp.production.product.line salesman,model_mrp_production_product_line,base.group_sale_salesman,1,0,1,0
@@ -16,7 +15,6 @@
access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_manager,1,1,1,1
access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_manager,1,1,1,1
access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_manager,1,1,1,1
-access_mrp_bom_revision_manager,mrp.bom.revision.manager,model_mrp_bom_revision,mrp.group_mrp_manager,1,1,1,1
access_stock_location_mrp_worker,stock.location mrp_worker,stock.model_stock_location,mrp.group_mrp_user,1,0,0,0
access_stock_move_mrp_worker,stock.move mrp_worker,stock.model_stock_move,mrp.group_mrp_user,1,1,1,0
access_stock_picking_mrp_worker,stock.picking mrp_worker,stock.model_stock_picking,mrp.group_mrp_user,1,1,1,1
=== modified file 'sale_mrp/security/ir.model.access.csv'
--- sale_mrp/security/ir.model.access.csv 2012-06-29 10:01:39 +0000
+++ sale_mrp/security/ir.model.access.csv 2012-08-31 05:12:54 +0000
@@ -2,4 +2,3 @@
access_mrp_bom_user,mrp.bom,mrp.model_mrp_bom,base.group_sale_salesman,1,0,0,0
access_sale_order_manufacturing_user,sale.order manufacturing.user,sale.model_sale_order,mrp.group_mrp_user,1,1,0,0
access_sale_order_line_manufacturing_user,sale.order.line manufacturing.user,sale.model_sale_order_line,mrp.group_mrp_user,1,1,0,0
-access_mrp_bom_revision_salesman,mrp.bom.revision,mrp.model_mrp_bom_revision,base.group_sale_salesman,1,0,0,0
_______________________________________________
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
