openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06258
[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-770168-ron into lp:openobject-addons
Rohan Nayani(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-770168-ron into lp:openobject-addons.
Requested reviews:
Rucha (Open ERP) (rpa-openerp)
Related bugs:
Bug #770168 in OpenERP Addons: "can't change date in Incoming shipment order"
https://bugs.launchpad.net/openobject-addons/+bug/770168
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-770168-ron/+merge/59742
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-770168-ron/+merge/59742
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-770168-ron.
=== modified file 'stock/stock.py'
--- stock/stock.py 2011-05-02 18:46:43 +0000
+++ stock/stock.py 2011-05-03 08:38:29 +0000
@@ -1517,7 +1517,7 @@
'name': fields.char('Name', size=64, required=True, select=True),
'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
'create_date': fields.datetime('Creation Date', readonly=True, select=True),
- 'date': fields.datetime('Date', required=True, select=True, help="Move date: scheduled date until move is done, then date of actual move processing", readonly=True),
+ 'date': fields.datetime('Date', required=True, select=True, help="Move date: scheduled date until move is done, then date of actual move processing", states={'done': [('readonly', True)]}),
'date_expected': fields.datetime('Scheduled Date', states={'done': [('readonly', True)]},required=True, select=True, help="Scheduled date for the processing of this move"),
'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')],states={'done': [('readonly', True)]}),
@@ -1753,6 +1753,16 @@
result['location_dest_id'] = loc_dest_id
return {'value': result}
+ def onchange_date(self, cr, uid, ids, date, date_expected, context=None):
+ """ On change of Scheduled Date gives a Move date.
+ @param date_expected: Scheduled Date
+ @param date: Move Date
+ @return: Move Date
+ """
+ if not date_expected:
+ date_expected = time.strftime('%Y-%m-%d'),
+ return {'value':{'date': date_expected}}
+
def _chain_compute(self, cr, uid, moves, context=None):
""" Finds whether the location has chained location type or not.
@param moves: Stock moves
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2011-05-02 18:46:43 +0000
+++ stock/stock_view.xml 2011-05-03 08:38:29 +0000
@@ -769,7 +769,7 @@
<separator string="Dates" colspan="2" />
<field name="create_date" invisible="1"/>
<field name="date"/>
- <field name="date_expected"/>
+ <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group>
<group colspan="2" col="4" groups="base.group_extended">
@@ -961,7 +961,7 @@
<separator string="Dates" colspan="2" />
<field name="create_date" invisible="1"/>
<field name="date"/>
- <field name="date_expected"/>
+ <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group>
<group colspan="2" col="4" groups="base.group_extended">
@@ -1181,7 +1181,7 @@
<separator string="Dates" colspan="2" />
<field name="create_date" invisible="1"/>
<field name="date"/>
- <field name="date_expected"/>
+ <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group>
<group colspan="2" col="4" groups="base.group_extended">
@@ -1449,7 +1449,7 @@
<separator string="Dates" colspan="2" />
<field name="create_date" groups="base.group_extended"/>
<field name="date" groups="base.group_extended"/>
- <field name="date_expected"/>
+ <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group>
<group colspan="2" col="4" groups="base.group_extended">
@@ -1644,7 +1644,7 @@
<separator string="Dates" colspan="2" />
<field name="create_date" groups="base.group_extended"/>
<field name="date" groups="base.group_extended"/>
- <field name="date_expected"/>
+ <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group>
<group colspan="2" col="4" groups="base.group_extended">
Follow ups