qdp (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-improve-addons27-mrp-psa into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-improve-addons27-mrp-psa/+merge/139429
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-improve-addons27-mrp-psa/+merge/139429
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-improve-addons27-mrp-psa.
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py 2012-12-08 16:27:24 +0000
+++ mrp/mrp.py 2012-12-12 10:45:33 +0000
@@ -1084,7 +1084,7 @@
'cycle': fields.float('Number of Cycles', digits=(16,2)),
'hour': fields.float('Number of Hours', digits=(16,2)),
'sequence': fields.integer('Sequence', required=True, help="Gives the sequence order when displaying a list of work orders."),
- 'production_id': fields.many2one('mrp.production', 'Production Order', select=True, ondelete='cascade', required=True),
+ 'production_id': fields.many2one('mrp.production', 'Manufacturing Order', select=True, ondelete='cascade', required=True),
}
_defaults = {
'sequence': lambda *a: 1,
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2012-12-09 10:55:27 +0000
+++ mrp/mrp_view.xml 2012-12-12 10:45:33 +0000
@@ -784,8 +784,8 @@
<group>
<group>
<field name="priority"/>
- <field name="date_start"/>
- <field name="date_finished"/>
+ <field name="date_start" invisible="1"/>
+ <field name="date_finished" invisible="1"/>
</group>
<group>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
=== modified file 'mrp_operations/mrp_operations.py'
--- mrp_operations/mrp_operations.py 2012-11-29 22:26:45 +0000
+++ mrp_operations/mrp_operations.py 2012-12-12 10:45:33 +0000
@@ -25,6 +25,7 @@
import time
from datetime import datetime
from tools.translate import _
+from datetime import timedelta
#----------------------------------------------------------
# Work Centers
@@ -71,6 +72,15 @@
res[op.id] = op.date_planned
return res
+ def onchange_production_id(self, cr, uid, ids, production_id, context=None):
+ products = self.pool.get('mrp.production').browse(cr, uid, production_id, context=None)
+ result = {
+ 'product': products.product_id.id,
+ 'qty': products.product_qty,
+ 'uom': products.product_uom.id,
+ }
+ return {'value': result}
+
_inherit = 'mrp.production.workcenter.line'
_order = "sequence, date_planned"
@@ -98,7 +108,8 @@
_defaults = {
'state': lambda *a: 'draft',
- 'delay': lambda *a: 0.0
+ 'delay': lambda *a: 0.0,
+ 'production_state': 'draft'
}
def modify_production_order_state(self, cr, uid, ids, action):
=== modified file 'mrp_operations/mrp_operations_view.xml'
--- mrp_operations/mrp_operations_view.xml 2012-11-29 22:26:45 +0000
+++ mrp_operations/mrp_operations_view.xml 2012-12-12 10:45:33 +0000
@@ -74,9 +74,9 @@
</header>
<sheet string="Work Orders">
<group col="4">
- <field colspan="4" name="name"/>
+ <field colspan="2" name="name"/>
<field name="workcenter_id"/>
- <field name="production_id"/>
+ <field name="production_id" on_change="onchange_production_id(production_id)"/>
<field name="production_state"/>
<field name="sequence"/>
</group>
@@ -92,7 +92,7 @@
<field name="cycle"/>
<field name="hour" widget="float_time"/>
</group>
- <group string="Real" >
+ <group string="Actual Production Date" >
<field name="date_start" readonly="1"/>
<field name="date_finished" readonly="1"/>
<field name="delay" widget="float_time"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
