From 21beef4b1987f67f3a48c79291d4194f8c28eb4d Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Wed, 16 Mar 2016 16:59:51 +0100 Subject: [PATCH 01/40] [FIX] account_asset: period_id field The field period_id didn't exist in model "account.asset.asset" Closes: #11262 opw:671494 --- addons/account_asset/account_asset_invoice.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py index 0d1903cfbc9..38fea23fbe3 100644 --- a/addons/account_asset/account_asset_invoice.py +++ b/addons/account_asset/account_asset_invoice.py @@ -52,7 +52,6 @@ class account_invoice_line(osv.osv): 'code': line.invoice_id.number or False, 'category_id': line.asset_category_id.id, 'purchase_value': line.price_subtotal, - 'period_id': line.invoice_id.period_id.id, 'partner_id': line.invoice_id.partner_id.id, 'company_id': line.invoice_id.company_id.id, 'currency_id': line.invoice_id.currency_id.id, From 1ec6a384fa041385485de7cac291d14d00fb802a Mon Sep 17 00:00:00 2001 From: Joren Van Onder Date: Thu, 17 Mar 2016 13:57:17 +0100 Subject: [PATCH 02/40] [FIX] point_of_sale: order product.product consistently with backend In the backend product.product records are not just ordered on their name, they are first ordered on default_code and then on name. The POS should order records the same way. opw-672284 --- addons/point_of_sale/static/src/js/models.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index b0513e53f8e..fa8079def79 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -317,7 +317,7 @@ exports.PosModel = Backbone.Model.extend({ fields: ['display_name', 'list_price','price','pos_categ_id', 'taxes_id', 'barcode', 'default_code', 'to_weight', 'uom_id', 'description_sale', 'description', 'product_tmpl_id'], - order: ['sequence','name'], + order: ['sequence','default_code','name'], domain: [['sale_ok','=',true],['available_in_pos','=',true]], context: function(self){ return { pricelist: self.pricelist.id, display_default_code: false }; }, loaded: function(self, products){ From af61494667ba549447f69e099fd359ad5b6e7f13 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Thu, 17 Mar 2016 14:38:42 +0100 Subject: [PATCH 03/40] [FIX] account_asset: compute depreciation button It is not allowed to recompute the depreciations when the asset is confirmed. opw:672203 --- addons/account_asset/account_asset_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index e3ed1d61102..facf309bb36 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -161,7 +161,7 @@ -