Ajay Chauhan(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons17_mrp-cha into
lp:openobject-addons.
Requested reviews:
Divyesh Makwana(OpenERP) (mdi-openerp)
Ajay Chauhan(OpenERP) (cha-tinyerp)
Purnendu Singh (OpenERP) (psi-tinyerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons17_mrp-cha/+merge/130066
Hello,
I have solved the issue of addons17 related to MRP.
Thanks,
Ajay Chauhan
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons17_mrp-cha/+merge/130066
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons17_mrp-cha.
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py 2012-10-16 05:25:13 +0000
+++ mrp/mrp.py 2012-10-30 08:38:22 +0000
@@ -515,6 +515,7 @@
'state': lambda *a: 'draft',
'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
'product_qty': lambda *a: 1.0,
+ 'user_id': lambda self, cr, uid, c: uid,
'name': lambda x, y, z, c: x.pool.get('ir.sequence').get(y, z, 'mrp.production') or '/',
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.production', context=c),
'location_src_id': _src_id_default,
=== modified file 'mrp_repair/mrp_repair_view.xml'
--- mrp_repair/mrp_repair_view.xml 2012-10-26 09:58:21 +0000
+++ mrp_repair/mrp_repair_view.xml 2012-10-30 08:38:22 +0000
@@ -34,16 +34,11 @@
<button name="action_invoice_create" states="2binvoiced" string="Make Invoice" class="oe_highlight"/>
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
<button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
- <button name="action_cancel" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="object" attrs="{'invisible':[('invoice_method','!=','none')]}"/>
- <button name="action_cancel" states="invoice_except" string="Cancel Repair" type="object" attrs="{'invisible':[('invoice_method','!=','none')]}"/>
+ <button name="action_cancel" string="Cancel Repair" type="object" attrs="{'invisible':['|',('invoice_method','!=','none'), ('state', 'not in',('confirmed','2binvoiced','ready','under_repair', 'invoice_except'))]}"/>
<button name="cancel" states="draft" string="Cancel Repair"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done"/>
</header>
<sheet string="Repairs order">
- <label for="product_id" class="oe_edit_only"/>
- <h1>
- </h1>
- <label for="name" class="oe_edit_only"/>
<h1>
Repair Order <field name="name" class="oe_inline"/>
</h1>
=== modified file 'mrp_repair/mrp_repair_workflow.xml'
--- mrp_repair/mrp_repair_workflow.xml 2011-01-14 00:11:01 +0000
+++ mrp_repair/mrp_repair_workflow.xml 2012-10-30 08:38:22 +0000
@@ -144,7 +144,7 @@
<record id="trans_ready_repair_start" model="workflow.transition">
<field name="act_from" ref="act_repair_ready"/>
<field name="act_to" ref="act_repair_start"/>
- <field name="signal">action_repair_start</field>
+ <field name="signal">repair_ready</field>
</record>
<record id="trans_repair_repair_end" model="workflow.transition">
=== modified file 'mrp_repair/test/test_mrp_repair_b4inv.yml'
--- mrp_repair/test/test_mrp_repair_b4inv.yml 2012-07-26 10:00:05 +0000
+++ mrp_repair/test/test_mrp_repair_b4inv.yml 2012-10-30 08:38:22 +0000
@@ -22,7 +22,7 @@
-
I start the Repairing process by clicking on "Start Repair" button.
-
- !workflow {model: mrp.repair, action: action_repair_start, ref: mrp_repair_rmrp2}
+ !workflow {model: mrp.repair, action: repair_ready, ref: mrp_repair_rmrp2}
-
Repairing process for this product is in Done state and I end this process by clicking on "End Repair" button for Invoice Method 'Before Repair'.
-
_______________________________________________
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
