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
1=== modified file 'mrp/i18n/mrp.pot'
2--- mrp/i18n/mrp.pot 2012-08-08 14:46:13 +0000
3+++ mrp/i18n/mrp.pot 2012-08-31 05:12:54 +0000
4@@ -197,11 +197,6 @@
5 msgstr ""
6
7 #. module: mrp
8-#: field:mrp.bom.revision,indice:0
9-msgid "Revision"
10-msgstr ""
11-
12-#. module: mrp
13 #: model:ir.actions.act_window,help:mrp.product_form_config_action
14 msgid "Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased."
15 msgstr ""
16@@ -436,11 +431,6 @@
17 msgstr ""
18
19 #. module: mrp
20-#: field:mrp.bom.revision,date:0
21-msgid "Modification Date"
22-msgstr ""
23-
24-#. module: mrp
25 #: help:mrp.workcenter,costs_cycle_account_id:0
26 #: help:mrp.workcenter,costs_hour_account_id:0
27 msgid "Complete this only if you want automatic analytic accounting entries on production orders."
28@@ -494,11 +484,6 @@
29 msgstr ""
30
31 #. module: mrp
32-#: field:mrp.bom.revision,author_id:0
33-msgid "Author"
34-msgstr ""
35-
36-#. module: mrp
37 #: field:report.mrp.inout,value:0
38 msgid "Stock value"
39 msgstr ""
40@@ -762,11 +747,6 @@
41 msgstr ""
42
43 #. module: mrp
44-#: field:mrp.bom.revision,name:0
45-msgid "Modification name"
46-msgstr ""
47-
48-#. module: mrp
49 #: view:mrp.bom:0
50 #: view:mrp.production:0
51 msgid "Date"
52@@ -1295,11 +1275,6 @@
53 msgstr ""
54
55 #. module: mrp
56-#: model:ir.model,name:mrp.model_mrp_bom_revision
57-msgid "Bill of Material Revision"
58-msgstr ""
59-
60-#. module: mrp
61 #: help:mrp.production,origin:0
62 msgid "Reference of the document that generated this production order request."
63 msgstr ""
64@@ -1773,12 +1748,6 @@
65 msgstr ""
66
67 #. module: mrp
68-#: field:mrp.bom.revision,bom_id:0
69-#: field:procurement.order,bom_id:0
70-msgid "BoM"
71-msgstr ""
72-
73-#. module: mrp
74 #: model:ir.model,name:mrp.model_report_mrp_inout
75 #: view:report.mrp.inout:0
76 msgid "Stock value variation"
77@@ -1796,17 +1765,6 @@
78 msgstr ""
79
80 #. module: mrp
81-#: field:mrp.bom.revision,last_indice:0
82-msgid "last indice"
83-msgstr ""
84-
85-#. module: mrp
86-#: field:mrp.bom,revision_ids:0
87-#: view:mrp.bom.revision:0
88-msgid "BoM Revisions"
89-msgstr ""
90-
91-#. module: mrp
92 #: field:report.mrp.inout,date:0
93 #: field:report.workcenter.load,name:0
94 msgid "Week"
95@@ -1988,19 +1946,6 @@
96 msgstr ""
97
98 #. module: mrp
99-#: view:mrp.bom.revision:0
100-#: field:mrp.bom.revision,description:0
101-#: view:mrp.property:0
102-#: view:mrp.property.group:0
103-#: field:mrp.routing,note:0
104-#: view:mrp.routing.workcenter:0
105-#: field:mrp.routing.workcenter,note:0
106-#: view:mrp.workcenter:0
107-#: field:mrp.workcenter,note:0
108-msgid "Description"
109-msgstr ""
110-
111-#. module: mrp
112 #: view:board.board:0
113 msgid "Manufacturing board"
114 msgstr ""
115
116=== modified file 'mrp/mrp.py'
117--- mrp/mrp.py 2012-08-15 20:51:43 +0000
118+++ mrp/mrp.py 2012-08-31 05:12:54 +0000
119@@ -214,7 +214,6 @@
120 'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True),
121 '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."),
122 'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
123- 'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
124 'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', string="BoM Hierarchy", type='many2many'),
125 'company_id': fields.many2one('res.company','Company',required=True),
126 }
127@@ -374,26 +373,6 @@
128
129 mrp_bom()
130
131-class mrp_bom_revision(osv.osv):
132- _name = 'mrp.bom.revision'
133- _description = 'Bill of Material Revision'
134- _columns = {
135- 'name': fields.char('Modification name', size=64, required=True),
136- 'description': fields.text('Description'),
137- 'date': fields.date('Modification Date'),
138- 'indice': fields.char('Revision', size=16),
139- 'last_indice': fields.char('last indice', size=64),
140- 'author_id': fields.many2one('res.users', 'Author'),
141- 'bom_id': fields.many2one('mrp.bom', 'BoM', select=True),
142- }
143-
144- _defaults = {
145- 'author_id': lambda x, y, z, c: z,
146- 'date': fields.date.context_today,
147- }
148-
149-mrp_bom_revision()
150-
151 def rounding(f, r):
152 import math
153 if not r:
154
155=== modified file 'mrp/mrp_view.xml'
156--- mrp/mrp_view.xml 2012-08-30 13:03:59 +0000
157+++ mrp/mrp_view.xml 2012-08-31 05:12:54 +0000
158@@ -347,7 +347,7 @@
159 <form string="Bill of Material" version="7.0">
160 <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
161 <h1>
162- <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>:
163+ <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>
164 <field name="product_qty" class="oe_inline"/>
165 <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
166 </h1>
167@@ -389,9 +389,6 @@
168 </tree>
169 </field>
170 </page>
171- <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
172- <field name="revision_ids"/>
173- </page>
174 <page string="Properties" groups="product.group_mrp_properties">
175 <group>
176 <group>
177@@ -411,6 +408,12 @@
178 <field name="property_ids" widget="many2many_tags"/>
179 </page>
180 </notebook>
181+ <footer>
182+ <div class="oe_chatter">
183+ <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
184+ <field name="message_follower_ids" widget="mail_followers"/>
185+ </div>
186+ </footer>
187 </form>
188 </field>
189 </record>
190@@ -542,35 +545,6 @@
191 <field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
192 </record>
193
194- <record id="mrp_bom_revision_tree" model="ir.ui.view">
195- <field name="name">mrp.bom.revision</field>
196- <field name="model">mrp.bom.revision</field>
197- <field name="arch" type="xml">
198- <tree string="BoM Revisions">
199- <field name="indice"/>
200- <field name="author_id"/>
201- <field name="date"/>
202- <field colspan="4" name="name"/>
203- </tree>
204- </field>
205- </record>
206- <record id="mrp_bom_revision_form" model="ir.ui.view">
207- <field name="name">mrp.bom.revision</field>
208- <field name="model">mrp.bom.revision</field>
209- <field name="arch" type="xml">
210- <form string="BoM Revisions" version="7.0">
211- <group col="4">
212- <field name="name"/>
213- <field name="indice"/>
214- <field name="date"/>
215- <field name="author_id" readonly="1"/>
216- </group>
217- <separator string="Description"/>
218- <field name="description"/>
219- </form>
220- </field>
221- </record>
222-
223 <!--
224 Production Management
225 -->
226
227=== modified file 'mrp/security/ir.model.access.csv'
228--- mrp/security/ir.model.access.csv 2012-06-21 05:16:16 +0000
229+++ mrp/security/ir.model.access.csv 2012-08-31 05:12:54 +0000
230@@ -3,7 +3,6 @@
231 access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
232 access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
233 access_mrp_bom,mrp.bom,model_mrp_bom,group_mrp_user,1,0,0,0
234-access_mrp_bom_revision,mrp.bom.revision,model_mrp_bom_revision,group_mrp_user,1,0,0,0
235 access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
236 access_mrp_production_salesman,mrp.production salesman,model_mrp_production,base.group_sale_salesman,1,1,1,0
237 access_mrp_production_product_line_salesman,mrp.production.product.line salesman,model_mrp_production_product_line,base.group_sale_salesman,1,0,1,0
238@@ -16,7 +15,6 @@
239 access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_manager,1,1,1,1
240 access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_manager,1,1,1,1
241 access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_manager,1,1,1,1
242-access_mrp_bom_revision_manager,mrp.bom.revision.manager,model_mrp_bom_revision,mrp.group_mrp_manager,1,1,1,1
243 access_stock_location_mrp_worker,stock.location mrp_worker,stock.model_stock_location,mrp.group_mrp_user,1,0,0,0
244 access_stock_move_mrp_worker,stock.move mrp_worker,stock.model_stock_move,mrp.group_mrp_user,1,1,1,0
245 access_stock_picking_mrp_worker,stock.picking mrp_worker,stock.model_stock_picking,mrp.group_mrp_user,1,1,1,1
246
247=== modified file 'sale_mrp/security/ir.model.access.csv'
248--- sale_mrp/security/ir.model.access.csv 2012-06-29 10:01:39 +0000
249+++ sale_mrp/security/ir.model.access.csv 2012-08-31 05:12:54 +0000
250@@ -2,4 +2,3 @@
251 access_mrp_bom_user,mrp.bom,mrp.model_mrp_bom,base.group_sale_salesman,1,0,0,0
252 access_sale_order_manufacturing_user,sale.order manufacturing.user,sale.model_sale_order,mrp.group_mrp_user,1,1,0,0
253 access_sale_order_line_manufacturing_user,sale.order.line manufacturing.user,sale.model_sale_order_line,mrp.group_mrp_user,1,1,0,0
254-access_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: