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

[jftempo]

=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2016-11-09 09:07:38 +0000
+++ bin/addons/sale_override/sale.py	2017-01-16 10:06:14 +0000
@@ -885,7 +885,7 @@
                                     fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
         'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
         'noinvoice': fields.function(_get_noinvoice, method=True, string="Don't create an invoice", type='boolean'),
-        'loan_duration': fields.integer(string='Loan duration', help='Loan duration in months', readonly=True, states={'draft': [('readonly', False)], 'validated': [('readonly', False)]}),
+        'loan_duration': fields.integer(string='Loan duration', help='Loan duration in months', readonly=False),
         'from_yml_test': fields.boolean('Only used to pass addons unit test', readonly=True, help='Never set this field to true !'),
         'yml_module_name': fields.char(size=1024, string='Name of the module which created the object in the yml tests', readonly=True),
         'company_id2': fields.many2one('res.company', 'Company', select=1),
@@ -2939,7 +2939,7 @@
             self.infolog(cr, uid, "The line id:%s (line number: %s) of the %s id:%s (%s) has been deleted." % ltl)
 
         if lines_to_check:
-            self.check_confirm_order(cr, uid, lines_to_check, run_scheduler=False, context=context, update_lines=False)
+            self.check_confirm_order(cr, uid, lines_to_check, run_scheduler=True, context=context, update_lines=False)
 
         return res
 
 
=== modified file 'bin/addons/sale_override/sale_view.xml'
--- bin/addons/sale_override/sale_view.xml	2016-03-24 08:35:00 +0000
+++ bin/addons/sale_override/sale_view.xml	2017-01-16 10:06:14 +0000
@@ -69,7 +69,7 @@
                         <field name="categ" on_change="onchange_categ(categ)" />
                         <group colspan="2" col="2">
                             <field name="fo_to_resource" invisible="1" />
-                            <field name="loan_duration" attrs="{'invisible': [('order_type', '!=', 'loan')], 'required': [('order_type', '=', 'loan')]}" />
+                            <field name="loan_duration" attrs="{'invisible': [('order_type', '!=', 'loan')], 'required': [('order_type', '=', 'loan')], 'readonly': ['|', ('state', 'not in', ['draft', 'validated']), ('order_type', '!=', 'loan')]}" />
                             <field name="parent_order_name" readonly="True" attrs="{'invisible': [('fo_to_resource', '=', False)]}" />
                         </group>
                         <field name="details" />
@@ -409,6 +409,13 @@
                   string="Save and Close"
                   type="object" 
                   icon="gtk-close" />
+                  <button
+                  name="ask_unlink"
+                  type="object"
+                  string="Delete"
+                  icon="gtk-cancel"
+                  invisible="True"
+                  confirm="This button shouldn't be use from form view. Please use the red cross on list view." />
               </form>
             </field>
         </record>