Merge lp:~unifield-team/unifield-wm/us-92 into lp:unifield-wm

Proposed by jftempo
Status: Merged
Merged at revision: 2396
Proposed branch: lp:~unifield-team/unifield-wm/us-92
Merge into: lp:unifield-wm
Diff against target: 36 lines (+14/-1)
2 files modified
msf_doc_import/wizard/wiz_common_import.py (+13/-0)
msf_doc_import/wizard/wiz_common_import_view.xml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-92
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+250323@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'msf_doc_import/wizard/wiz_common_import.py'
2--- msf_doc_import/wizard/wiz_common_import.py 2015-02-13 08:16:15 +0000
3+++ msf_doc_import/wizard/wiz_common_import.py 2015-02-19 15:07:11 +0000
4@@ -271,6 +271,19 @@
5 store=False,
6 ),
7 }
8+
9+ def on_change_import_product_qty(self, cr, uid, ids, import_product_qty,
10+ context=None):
11+ res = {}
12+ if not ids:
13+ return res
14+ if import_product_qty and import_product_qty < 0:
15+ res['warning'] = {
16+ 'value': {'import_product_qty': 0.},
17+ 'title': _('Warning'),
18+ 'message': _('You can not set a negative quantity'),
19+ }
20+ return res
21
22 product_product()
23
24
25=== modified file 'msf_doc_import/wizard/wiz_common_import_view.xml'
26--- msf_doc_import/wizard/wiz_common_import_view.xml 2015-01-23 15:27:47 +0000
27+++ msf_doc_import/wizard/wiz_common_import_view.xml 2015-02-19 15:07:11 +0000
28@@ -16,7 +16,7 @@
29 <tree string="Products" editable="top">
30 <field name="default_code" readonly="True" />
31 <field name="name" readonly="True" />
32- <field name="import_product_qty" />
33+ <field name="import_product_qty" on_change="on_change_import_product_qty(import_product_qty, context)"/>
34 </tree>
35 </field>
36 <separator colspan="4" string="Actions" />

Subscribers

People subscribed via source and target branches