Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-addons7-bom-aja into lp:~openerp-dev/openobject-addons/trunk-addons7

  1. trunk-addons7-bom-aja
  2. Merge into trunk-addons7
Proposed by ajay javiya (OpenERP)
Status: Merged
Merged at revision: 7328
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-addons7-bom-aja
Merge into: lp:~openerp-dev/openobject-addons/trunk-addons7
Diff against target: 254 lines (+7/-112)
5 files modified
mrp/i18n/mrp.pot (+0/-55)
mrp/mrp.py (+0/-21)
mrp/mrp_view.xml (+7/-33)
mrp/security/ir.model.access.csv (+0/-2)
sale_mrp/security/ir.model.access.csv (+0/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-addons7-bom-aja
Reviewer Review Type Date Requested Status
Jigar A. Approve
Review via email: mp+122190@code.launchpad.net

Description of the change

Hello,
remove revision tab and all related field and add open chatter in the bottom as a replacement.
Thank You

To post a comment you must log in.
Revision history for this message
Jigar A. (ifixthat) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
197msgstr ""197msgstr ""
198198
199#. module: mrp199#. module: mrp
200#: field:mrp.bom.revision,indice:0
201msgid "Revision"
202msgstr ""
203
204#. module: mrp
205#: model:ir.actions.act_window,help:mrp.product_form_config_action200#: model:ir.actions.act_window,help:mrp.product_form_config_action
206msgid "Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased."201msgid "Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased."
207msgstr ""202msgstr ""
@@ -436,11 +431,6 @@
436msgstr ""431msgstr ""
437432
438#. module: mrp433#. module: mrp
439#: field:mrp.bom.revision,date:0
440msgid "Modification Date"
441msgstr ""
442
443#. module: mrp
444#: help:mrp.workcenter,costs_cycle_account_id:0434#: help:mrp.workcenter,costs_cycle_account_id:0
445#: help:mrp.workcenter,costs_hour_account_id:0435#: help:mrp.workcenter,costs_hour_account_id:0
446msgid "Complete this only if you want automatic analytic accounting entries on production orders."436msgid "Complete this only if you want automatic analytic accounting entries on production orders."
@@ -494,11 +484,6 @@
494msgstr ""484msgstr ""
495485
496#. module: mrp486#. module: mrp
497#: field:mrp.bom.revision,author_id:0
498msgid "Author"
499msgstr ""
500
501#. module: mrp
502#: field:report.mrp.inout,value:0487#: field:report.mrp.inout,value:0
503msgid "Stock value"488msgid "Stock value"
504msgstr ""489msgstr ""
@@ -762,11 +747,6 @@
762msgstr ""747msgstr ""
763748
764#. module: mrp749#. module: mrp
765#: field:mrp.bom.revision,name:0
766msgid "Modification name"
767msgstr ""
768
769#. module: mrp
770#: view:mrp.bom:0750#: view:mrp.bom:0
771#: view:mrp.production:0751#: view:mrp.production:0
772msgid "Date"752msgid "Date"
@@ -1295,11 +1275,6 @@
1295msgstr ""1275msgstr ""
12961276
1297#. module: mrp1277#. module: mrp
1298#: model:ir.model,name:mrp.model_mrp_bom_revision
1299msgid "Bill of Material Revision"
1300msgstr ""
1301
1302#. module: mrp
1303#: help:mrp.production,origin:01278#: help:mrp.production,origin:0
1304msgid "Reference of the document that generated this production order request."1279msgid "Reference of the document that generated this production order request."
1305msgstr ""1280msgstr ""
@@ -1773,12 +1748,6 @@
1773msgstr ""1748msgstr ""
17741749
1775#. module: mrp1750#. module: mrp
1776#: field:mrp.bom.revision,bom_id:0
1777#: field:procurement.order,bom_id:0
1778msgid "BoM"
1779msgstr ""
1780
1781#. module: mrp
1782#: model:ir.model,name:mrp.model_report_mrp_inout1751#: model:ir.model,name:mrp.model_report_mrp_inout
1783#: view:report.mrp.inout:01752#: view:report.mrp.inout:0
1784msgid "Stock value variation"1753msgid "Stock value variation"
@@ -1796,17 +1765,6 @@
1796msgstr ""1765msgstr ""
17971766
1798#. module: mrp1767#. module: mrp
1799#: field:mrp.bom.revision,last_indice:0
1800msgid "last indice"
1801msgstr ""
1802
1803#. module: mrp
1804#: field:mrp.bom,revision_ids:0
1805#: view:mrp.bom.revision:0
1806msgid "BoM Revisions"
1807msgstr ""
1808
1809#. module: mrp
1810#: field:report.mrp.inout,date:01768#: field:report.mrp.inout,date:0
1811#: field:report.workcenter.load,name:01769#: field:report.workcenter.load,name:0
1812msgid "Week"1770msgid "Week"
@@ -1988,19 +1946,6 @@
1988msgstr ""1946msgstr ""
19891947
1990#. module: mrp1948#. module: mrp
1991#: view:mrp.bom.revision:0
1992#: field:mrp.bom.revision,description:0
1993#: view:mrp.property:0
1994#: view:mrp.property.group:0
1995#: field:mrp.routing,note:0
1996#: view:mrp.routing.workcenter:0
1997#: field:mrp.routing.workcenter,note:0
1998#: view:mrp.workcenter:0
1999#: field:mrp.workcenter,note:0
2000msgid "Description"
2001msgstr ""
2002
2003#. module: mrp
2004#: view:board.board:01949#: view:board.board:0
2005msgid "Manufacturing board"1950msgid "Manufacturing board"
2006msgstr ""1951msgstr ""
20071952
=== 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 @@
214 'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True),214 'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True),
215 '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."),215 '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."),
216 'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),216 'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
217 'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
218 'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', string="BoM Hierarchy", type='many2many'),217 'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', string="BoM Hierarchy", type='many2many'),
219 'company_id': fields.many2one('res.company','Company',required=True),218 'company_id': fields.many2one('res.company','Company',required=True),
220 }219 }
@@ -374,26 +373,6 @@
374373
375mrp_bom()374mrp_bom()
376375
377class mrp_bom_revision(osv.osv):
378 _name = 'mrp.bom.revision'
379 _description = 'Bill of Material Revision'
380 _columns = {
381 'name': fields.char('Modification name', size=64, required=True),
382 'description': fields.text('Description'),
383 'date': fields.date('Modification Date'),
384 'indice': fields.char('Revision', size=16),
385 'last_indice': fields.char('last indice', size=64),
386 'author_id': fields.many2one('res.users', 'Author'),
387 'bom_id': fields.many2one('mrp.bom', 'BoM', select=True),
388 }
389
390 _defaults = {
391 'author_id': lambda x, y, z, c: z,
392 'date': fields.date.context_today,
393 }
394
395mrp_bom_revision()
396
397def rounding(f, r):376def rounding(f, r):
398 import math377 import math
399 if not r:378 if not r:
400379
=== 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 @@
347 <form string="Bill of Material" version="7.0">347 <form string="Bill of Material" version="7.0">
348 <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>348 <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
349 <h1>349 <h1>
350 <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>:350 <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>
351 <field name="product_qty" class="oe_inline"/>351 <field name="product_qty" class="oe_inline"/>
352 <field name="product_uom" class="oe_inline" groups="product.group_uom"/>352 <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
353 </h1>353 </h1>
@@ -389,9 +389,6 @@
389 </tree>389 </tree>
390 </field>390 </field>
391 </page>391 </page>
392 <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
393 <field name="revision_ids"/>
394 </page>
395 <page string="Properties" groups="product.group_mrp_properties">392 <page string="Properties" groups="product.group_mrp_properties">
396 <group>393 <group>
397 <group>394 <group>
@@ -411,6 +408,12 @@
411 <field name="property_ids" widget="many2many_tags"/>408 <field name="property_ids" widget="many2many_tags"/>
412 </page>409 </page>
413 </notebook>410 </notebook>
411 <footer>
412 <div class="oe_chatter">
413 <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
414 <field name="message_follower_ids" widget="mail_followers"/>
415 </div>
416 </footer>
414 </form>417 </form>
415 </field>418 </field>
416 </record>419 </record>
@@ -542,35 +545,6 @@
542 <field eval="'ir.actions.act_window,'+str(action2)" name="value"/>545 <field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
543 </record>546 </record>
544547
545 <record id="mrp_bom_revision_tree" model="ir.ui.view">
546 <field name="name">mrp.bom.revision</field>
547 <field name="model">mrp.bom.revision</field>
548 <field name="arch" type="xml">
549 <tree string="BoM Revisions">
550 <field name="indice"/>
551 <field name="author_id"/>
552 <field name="date"/>
553 <field colspan="4" name="name"/>
554 </tree>
555 </field>
556 </record>
557 <record id="mrp_bom_revision_form" model="ir.ui.view">
558 <field name="name">mrp.bom.revision</field>
559 <field name="model">mrp.bom.revision</field>
560 <field name="arch" type="xml">
561 <form string="BoM Revisions" version="7.0">
562 <group col="4">
563 <field name="name"/>
564 <field name="indice"/>
565 <field name="date"/>
566 <field name="author_id" readonly="1"/>
567 </group>
568 <separator string="Description"/>
569 <field name="description"/>
570 </form>
571 </field>
572 </record>
573
574 <!--548 <!--
575 Production Management549 Production Management
576 -->550 -->
577551
=== 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 @@
3access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,03access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
4access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,04access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
5access_mrp_bom,mrp.bom,model_mrp_bom,group_mrp_user,1,0,0,05access_mrp_bom,mrp.bom,model_mrp_bom,group_mrp_user,1,0,0,0
6access_mrp_bom_revision,mrp.bom.revision,model_mrp_bom_revision,group_mrp_user,1,0,0,0
7access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,16access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
8access_mrp_production_salesman,mrp.production salesman,model_mrp_production,base.group_sale_salesman,1,1,1,07access_mrp_production_salesman,mrp.production salesman,model_mrp_production,base.group_sale_salesman,1,1,1,0
9access_mrp_production_product_line_salesman,mrp.production.product.line salesman,model_mrp_production_product_line,base.group_sale_salesman,1,0,1,08access_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 @@
16access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_manager,1,1,1,115access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_manager,1,1,1,1
17access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_manager,1,1,1,116access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_manager,1,1,1,1
18access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_manager,1,1,1,117access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_manager,1,1,1,1
19access_mrp_bom_revision_manager,mrp.bom.revision.manager,model_mrp_bom_revision,mrp.group_mrp_manager,1,1,1,1
20access_stock_location_mrp_worker,stock.location mrp_worker,stock.model_stock_location,mrp.group_mrp_user,1,0,0,018access_stock_location_mrp_worker,stock.location mrp_worker,stock.model_stock_location,mrp.group_mrp_user,1,0,0,0
21access_stock_move_mrp_worker,stock.move mrp_worker,stock.model_stock_move,mrp.group_mrp_user,1,1,1,019access_stock_move_mrp_worker,stock.move mrp_worker,stock.model_stock_move,mrp.group_mrp_user,1,1,1,0
22access_stock_picking_mrp_worker,stock.picking mrp_worker,stock.model_stock_picking,mrp.group_mrp_user,1,1,1,120access_stock_picking_mrp_worker,stock.picking mrp_worker,stock.model_stock_picking,mrp.group_mrp_user,1,1,1,1
2321
=== 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 @@
2access_mrp_bom_user,mrp.bom,mrp.model_mrp_bom,base.group_sale_salesman,1,0,0,02access_mrp_bom_user,mrp.bom,mrp.model_mrp_bom,base.group_sale_salesman,1,0,0,0
3access_sale_order_manufacturing_user,sale.order manufacturing.user,sale.model_sale_order,mrp.group_mrp_user,1,1,0,03access_sale_order_manufacturing_user,sale.order manufacturing.user,sale.model_sale_order,mrp.group_mrp_user,1,1,0,0
4access_sale_order_line_manufacturing_user,sale.order.line manufacturing.user,sale.model_sale_order_line,mrp.group_mrp_user,1,1,0,04access_sale_order_line_manufacturing_user,sale.order.line manufacturing.user,sale.model_sale_order_line,mrp.group_mrp_user,1,1,0,0
5access_mrp_bom_revision_salesman,mrp.bom.revision,mrp.model_mrp_bom_revision,base.group_sale_salesman,1,0,0,0

Subscribers

People subscribed via source and target branches

to all changes: