From 39db0475146cf6c76cd923f4058cfb17dfae5bfe Mon Sep 17 00:00:00 2001 From: Darshil Trivedi Date: Tue, 6 Mar 2018 12:40:25 +0530 Subject: [PATCH] [IMP] stock, stock_account: Inventory Adjustment dates - Change "Force Accounting Date" label in "Accounting Date" on inventory adjustments. - 'accounting_date' only visible in debug mode - Improvement tooltip of accounting_date,date TASK-1819891 --- addons/stock/models/stock_inventory.py | 3 ++- addons/stock_account/models/stock.py | 8 ++++---- addons/stock_account/views/stock_account_views.xml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/stock/models/stock_inventory.py b/addons/stock/models/stock_inventory.py index 83775922b33..252ca0aa4a5 100644 --- a/addons/stock/models/stock_inventory.py +++ b/addons/stock/models/stock_inventory.py @@ -29,7 +29,8 @@ class Inventory(models.Model): 'Inventory Date', readonly=True, required=True, default=fields.Datetime.now, - help="The date that will be used for the stock level check of the products and the validation of the stock move related to this inventory.") + help="If the inventory adjustment is not validated, date at which the theoritical quantities have been checked.\n" + "If the inventory adjustment is validated, date at which the inventory adjustment has been validated.") line_ids = fields.One2many( 'stock.inventory.line', 'inventory_id', string='Inventories', copy=True, readonly=False, diff --git a/addons/stock_account/models/stock.py b/addons/stock_account/models/stock.py index 6f2cbc97638..4203f04cd40 100644 --- a/addons/stock_account/models/stock.py +++ b/addons/stock_account/models/stock.py @@ -15,10 +15,10 @@ class StockInventory(models.Model): _inherit = "stock.inventory" accounting_date = fields.Date( - 'Force Accounting Date', - help="Choose the accounting date at which you want to value the stock " - "moves created by the inventory instead of the default one (the " - "inventory end date)") + 'Accounting Date', + help="Date at which the accounting entries will be created" + " in case of automated inventory valuation." + " If empty, the inventoy date will be used.") @api.multi def post_inventory(self): diff --git a/addons/stock_account/views/stock_account_views.xml b/addons/stock_account/views/stock_account_views.xml index 814ee2bbb0b..df65bddb74c 100644 --- a/addons/stock_account/views/stock_account_views.xml +++ b/addons/stock_account/views/stock_account_views.xml @@ -19,7 +19,7 @@ - +