From 150dc66ec02d68f19520a6f9224384d2562155f9 Mon Sep 17 00:00:00 2001 From: Julien Legros Date: Thu, 6 Nov 2014 11:47:38 +0100 Subject: [PATCH 1/2] [FIX] account_asset: moves should use the depreciation line date --- addons/account_asset/account_asset.py | 2 +- addons/account_asset/account_asset_demo.xml | 2 +- .../account_asset/test/account_asset_demo.yml | 44 ++++++++++++++++++- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 806013e6a4c..9cf4c14fff2 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -399,7 +399,7 @@ class account_asset_depreciation_line(osv.osv): created_move_ids = [] asset_ids = [] for line in self.browse(cr, uid, ids, context=context): - depreciation_date = context.get('depreciation_date') or time.strftime('%Y-%m-%d') + depreciation_date = context.get('depreciation_date') or line.depreciation_date or time.strftime('%Y-%m-%d') ctx = dict(context, account_period_prefer_normal=True) period_ids = period_obj.find(cr, uid, depreciation_date, context=ctx) company_currency = line.asset_id.company_id.currency_id.id diff --git a/addons/account_asset/account_asset_demo.xml b/addons/account_asset/account_asset_demo.xml index 5b1a4b03be6..ec18c4a5df6 100644 --- a/addons/account_asset/account_asset_demo.xml +++ b/addons/account_asset/account_asset_demo.xml @@ -41,7 +41,7 @@ open - + CEO's Car diff --git a/addons/account_asset/test/account_asset_demo.yml b/addons/account_asset/test/account_asset_demo.yml index c0871d05268..56d4d7ce8ac 100644 --- a/addons/account_asset/test/account_asset_demo.yml +++ b/addons/account_asset/test/account_asset_demo.yml @@ -6,4 +6,46 @@ category_id: account_asset_category_sale - !record {model: account.asset.asset, id: account_asset_asset_vehicles0}: - method_number: 10 + method_number: 5 +- + !record {model: account.fiscalyear, id: data_fiscalyear_plus1}: + company_id: base.main_company + date_start: !eval "'%s-01-01' %(datetime.now().year+1)" + date_stop: !eval "'%s-12-31' %(datetime.now().year+1)" + name: !eval "'Fiscal Year X %s' %(datetime.now().year+1)" + code: !eval "'FY%s' %(datetime.now().year+1)" +- + !record {model: account.fiscalyear, id: data_fiscalyear_plus2}: + company_id: base.main_company + date_start: !eval "'%s-01-01' %(datetime.now().year+2)" + date_stop: !eval "'%s-12-31' %(datetime.now().year+2)" + name: !eval "'Fiscal Year X %s' %(datetime.now().year+2)" + code: !eval "'FY%s' %(datetime.now().year+2)" +- + !record {model: account.fiscalyear, id: data_fiscalyear_plus3}: + company_id: base.main_company + date_start: !eval "'%s-01-01' %(datetime.now().year+3)" + date_stop: !eval "'%s-12-31' %(datetime.now().year+3)" + name: !eval "'Fiscal Year X %s' %(datetime.now().year+3)" + code: !eval "'FY%s' %(datetime.now().year+3)" +- + !record {model: account.fiscalyear, id: data_fiscalyear_plus4}: + company_id: base.main_company + date_start: !eval "'%s-01-01' %(datetime.now().year+4)" + date_stop: !eval "'%s-12-31' %(datetime.now().year+4)" + name: !eval "'Fiscal Year X %s' %(datetime.now().year+4)" + code: !eval "'FY%s' %(datetime.now().year+4)" +- + !record {model: account.fiscalyear, id: data_fiscalyear_plus5}: + company_id: base.main_company + date_start: !eval "'%s-01-01' %(datetime.now().year+5)" + date_stop: !eval "'%s-12-31' %(datetime.now().year+5)" + name: !eval "'Fiscal Year X %s' %(datetime.now().year+5)" + code: !eval "'FY%s' %(datetime.now().year+5)" +- + !python {model: account.fiscalyear}: | + self.create_period(cr, uid, [ref("data_fiscalyear_plus1")]) + self.create_period(cr, uid, [ref("data_fiscalyear_plus2")]) + self.create_period(cr, uid, [ref("data_fiscalyear_plus3")]) + self.create_period(cr, uid, [ref("data_fiscalyear_plus4")]) + self.create_period(cr, uid, [ref("data_fiscalyear_plus5")]) From d36c8b5c9bf7ab9215bc63db6ee49bec5e5b225b Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 6 Nov 2014 14:49:25 +0100 Subject: [PATCH 2/2] [FIX] web: FieldMany2ManyBinaryMultiFiles must extend ReinitializeFieldMixin The add attachment button should be displayed while being in edit mode, but not in view mode As the widget depends on the form actual mode, the widget should be re-rendered each time the actual mode changes This is the point of the ReinitializeFieldMixin class --- addons/web/static/src/js/view_form.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index cfada94c4e7..077b05c6096 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -5222,7 +5222,7 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({ * Options on attribute ; "blockui" {Boolean} block the UI or not * during the file is uploading */ -instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractField.extend({ +instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, { template: "FieldBinaryFileUploader", init: function(field_manager, node) { this._super(field_manager, node); @@ -5236,7 +5236,8 @@ instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractFie $(window).on(this.fileupload_id, _.bind(this.on_file_loaded, this)); }, start: function() { - this._super(this); + this._super(); + instance.web.form.ReinitializeFieldMixin.start.call(this); this.$el.on('change', 'input.oe_form_binary_file', this.on_file_change ); }, set_value: function(value_) {