Unifield Server

Merge lp:~unifield-team/unifield-server/us-2085 into lp:unifield-server

  1. us-2085
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4137
Proposed branch: lp:~unifield-team/unifield-server/us-2085
Merge into: lp:unifield-server
Diff against target: 48 lines (+10/-3)
2 files modified
bin/addons/sale_override/sale.py (+2/-2)
bin/addons/sale_override/sale_view.xml (+8/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-2085
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+314801@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 'bin/addons/sale_override/sale.py'
2--- bin/addons/sale_override/sale.py 2016-11-09 09:07:38 +0000
3+++ bin/addons/sale_override/sale.py 2017-01-16 10:06:14 +0000
4@@ -885,7 +885,7 @@
5 fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
6 'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
7 'noinvoice': fields.function(_get_noinvoice, method=True, string="Don't create an invoice", type='boolean'),
8- 'loan_duration': fields.integer(string='Loan duration', help='Loan duration in months', readonly=True, states={'draft': [('readonly', False)], 'validated': [('readonly', False)]}),
9+ 'loan_duration': fields.integer(string='Loan duration', help='Loan duration in months', readonly=False),
10 'from_yml_test': fields.boolean('Only used to pass addons unit test', readonly=True, help='Never set this field to true !'),
11 'yml_module_name': fields.char(size=1024, string='Name of the module which created the object in the yml tests', readonly=True),
12 'company_id2': fields.many2one('res.company', 'Company', select=1),
13@@ -2939,7 +2939,7 @@
14 self.infolog(cr, uid, "The line id:%s (line number: %s) of the %s id:%s (%s) has been deleted." % ltl)
15
16 if lines_to_check:
17- self.check_confirm_order(cr, uid, lines_to_check, run_scheduler=False, context=context, update_lines=False)
18+ self.check_confirm_order(cr, uid, lines_to_check, run_scheduler=True, context=context, update_lines=False)
19
20 return res
21
22
23=== modified file 'bin/addons/sale_override/sale_view.xml'
24--- bin/addons/sale_override/sale_view.xml 2016-03-24 08:35:00 +0000
25+++ bin/addons/sale_override/sale_view.xml 2017-01-16 10:06:14 +0000
26@@ -69,7 +69,7 @@
27 <field name="categ" on_change="onchange_categ(categ)" />
28 <group colspan="2" col="2">
29 <field name="fo_to_resource" invisible="1" />
30- <field name="loan_duration" attrs="{'invisible': [('order_type', '!=', 'loan')], 'required': [('order_type', '=', 'loan')]}" />
31+ <field name="loan_duration" attrs="{'invisible': [('order_type', '!=', 'loan')], 'required': [('order_type', '=', 'loan')], 'readonly': ['|', ('state', 'not in', ['draft', 'validated']), ('order_type', '!=', 'loan')]}" />
32 <field name="parent_order_name" readonly="True" attrs="{'invisible': [('fo_to_resource', '=', False)]}" />
33 </group>
34 <field name="details" />
35@@ -409,6 +409,13 @@
36 string="Save and Close"
37 type="object"
38 icon="gtk-close" />
39+ <button
40+ name="ask_unlink"
41+ type="object"
42+ string="Delete"
43+ icon="gtk-cancel"
44+ invisible="True"
45+ confirm="This button shouldn't be use from form view. Please use the red cross on list view." />
46 </form>
47 </field>
48 </record>

Subscribers

People subscribed via source and target branches

to all changes: