audrius/stock-logistics-reporting
1
0
Fork 1
mirror of https://github.com/OCA/stock-logistics-reporting.git synced 2025-02-16 17:13:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #118 into 11.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2020-10-14 10:48:20 +00:00
parent 0b6fbf8473 8031f5d7f1
commit 0ffb73ed81
12 changed files with 188 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
stock_account_quantity_history_location/__init__.py
View File

@@ -0,0 +1 @@
from . import wizards

1
stock_account_quantity_history_location/tests/__init__.py Normal file
View File

@@ -0,0 +1 @@
from . import test_valuation_location

55
stock_account_quantity_history_location/tests/test_valuation_location.py Normal file
View File

@@ -0,0 +1,55 @@
# Copyright 2020 Tecnativa - David Vidal
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo.addons.stock_quantity_history_location.tests import (
test_stock_quantity_history_location
)
class TestValuationLocation(test_stock_quantity_history_location
.TestStockQuantityHistoryLocation):
@classmethod
def setUpClass(cls):
super().setUpClass()
cls.env['product.price.history'].create({
'datetime': '2019-08-12',
'product_id': cls.product.id,
'cost': 35.01,
})
cls.env['product.price.history'].create({
'datetime': '2020-01-01',
'product_id': cls.product.id,
'cost': 33.33,
})
cls.product.categ_id.property_cost_method = 'standard'
cls.test_stock_loc2 = cls.env['stock.location'].create({
'usage': 'internal',
'name': 'Test Stock Location 2',
'company_id': cls.main_company.id
})
# Create a move for the past
move = cls.env['stock.move'].create({
'name': 'Stock move in',
'location_id': cls.supplier_location.id,
'location_dest_id': cls.test_stock_loc2.id,
'product_id': cls.product.id,
'product_uom': cls.product.uom_id.id,
'product_uom_qty': 50.0,
})
move._action_confirm()
move._action_assign()
move_line = move.move_line_ids[0]
move_line.qty_done = 50.0
move._action_done()
move.date = "2020-01-01"
def test_stock_location_valuation(self):
wizard = self.env['stock.quantity.history'].create({
"location_id": self.test_stock_loc2.id,
"include_child_locations": True,
"compute_at_date": 1,
"date": "2020-01-01",
})
action = wizard.with_context(
company_owned=True, valuation=True).open_table()
self.assertAlmostEqual(
self.product.with_context(action['context']).stock_value, 1666.5)

2
stock_account_quantity_history_location/wizards/__init__.py Normal file
View File

@@ -0,0 +1,2 @@
from . import stock_quantity_history

36
stock_account_quantity_history_location/wizards/stock_quantity_history.py Normal file
View File

@@ -0,0 +1,36 @@
# Copyright 2019 Eficent Business and IT Consulting Services, S.L.
# Copyright 2019 Aleph Objects, Inc.
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
import ast
from odoo import models
class StockQuantityHistory(models.TransientModel):
_inherit = 'stock.quantity.history'
def open_table(self):
"""Stock valuation goes by a different path than stock report, so
we ensure the correct context as well"""
action = super().open_table()
if not self.env.context.get('valuation'):
return action
# Show 0 quantities on Inventory Valuation to display Account Valuation
# anomalies, such as, non 0 stock_value on cost_method FIFO
if not self.location_id:
domain = ast.literal_eval(action['domain'])
domain.pop(domain.index(('qty_available', '!=', 0)))
action['domain'] = domain
ctx = action['context']
if isinstance(ctx, str):
ctx = ast.literal_eval(ctx)
if self.location_id:
ctx['location'] = self.location_id.id
ctx['compute_child'] = self.include_child_locations
if ctx.get('company_owned', False):
ctx.pop('company_owned')
# Ensure the context isn't added later and catch it
ctx['drop_company_owned'] = True
action['name'] = '%s (%s)' % (action['name'],
self.location_id.complete_name)
action['context'] = ctx
return action

6
stock_account_quantity_history_location/wizards/stock_quantity_history.xml
View File

@@ -9,12 +9,6 @@
<field name="location_id"/>
<field name="include_child_locations"
attrs="{'invisible': [('location_id', '=', False)]}"/>
<div class="alert alert-warning" colspan="2"
attrs="{'invisible': [('location_id', '=', False)]}"
style="margin-bottom:0px;">
<p><i class="fa fa-info-circle"/> The accounting valuation is not calculated when you specify a location.
</p>
</div>
</field>
</field>
</record>

1
stock_quantity_history_location/__init__.py
View File

@@ -1 +1,2 @@
from . import models
from . import wizards

1
stock_quantity_history_location/models/__init__.py Normal file
View File

@@ -0,0 +1 @@
from . import product

16
stock_quantity_history_location/models/product.py Normal file
View File

@@ -0,0 +1,16 @@
# Copyright 2019 Tecnativa - David Vidal
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import models
class ProductProduct(models.Model):
_inherit = 'product.product'
def _get_domain_locations(self):
"""Ensures the location context isn't overriden"""
ctx = dict(self.env.context)
if not ctx.get('drop_company_owned') or not ctx.get('company_owned'):
return super()._get_domain_locations()
ctx.pop('company_owned', None)
self_ctx = self.with_context(ctx)
return super(ProductProduct, self_ctx)._get_domain_locations()

6
stock_quantity_history_location/static/description/index.html
View File

@@ -367,7 +367,7 @@ ul.auto-toc {
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/tree/11.0/stock_quantity_history_location"><img alt="OCA/stock-logistics-reporting" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--reporting-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-reporting-11-0/stock-logistics-reporting-11-0-stock_quantity_history_location"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/151/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/tree/12.0/stock_quantity_history_location"><img alt="OCA/stock-logistics-reporting" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--reporting-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-reporting-12-0/stock-logistics-reporting-12-0-stock_quantity_history_location"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/151/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>This module allows to run an Inventory report or Inventory Valuation
report by location, for a past date or for current date.</p>
<p><strong>Table of contents</strong></p>
@@ -404,7 +404,7 @@ report by location, for a past date or for current date.</p>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/issues/new?body=module:%20stock_quantity_history_location%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/issues/new?body=module:%20stock_quantity_history_location%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
@@ -422,7 +422,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/tree/11.0/stock_quantity_history_location">OCA/stock-logistics-reporting</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/tree/12.0/stock_quantity_history_location">OCA/stock-logistics-reporting</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>

68
stock_quantity_history_location/tests/test_stock_quantity_history_location.py
View File

@@ -9,14 +9,68 @@ class TestStockQuantityHistoryLocation(SavepointCase):
@classmethod
def setUpClass(cls):
super(TestStockQuantityHistoryLocation, cls).setUpClass()
cls.stock_loc = cls.env.ref('stock.stock_location_stock')
cls.supplier_location = cls.env.ref('stock.stock_location_suppliers')
cls.main_company = cls.env.ref('base.main_company')
cls.product = cls.env.ref('product.product_product_3')
cls.test_stock_loc = cls.env['stock.location'].create({
'usage': 'internal',
'name': 'Test Stock Location',
'company_id': cls.main_company.id
})
cls.child_test_stock_loc = cls.env['stock.location'].create({
'usage': 'internal',
'name': 'Child Test Stock Location',
'location_id': cls.test_stock_loc.id,
'company_id': cls.main_company.id
})
# Create a move for the past
move = cls.env['stock.move'].create({
'name': 'Stock move in',
'location_id': cls.supplier_location.id,
'location_dest_id': cls.child_test_stock_loc.id,
'product_id': cls.product.id,
'product_uom': cls.product.uom_id.id,
'product_uom_qty': 100.0,
})
move._action_confirm()
move._action_assign()
move_line = move.move_line_ids[0]
move_line.qty_done = 100.0
move._action_done()
move.date = "2019-08-11"
def test_wizard(self):
self.wizard = self.env['stock.quantity.history'].create({
"location_id": self.stock_loc.id,
class StockQuantityHistoryLocationTests(TestStockQuantityHistoryLocation):
def test_wizard_past_date(self):
wizard = self.env['stock.quantity.history'].create({
"location_id": self.test_stock_loc.id,
"include_child_locations": True,
"compute_at_date": 1,
"date": "2019-08-12",
})
action = wizard.with_context(company_owned=True).open_table()
self.assertEquals(
self.product.with_context(action['context']).qty_available, 100.0)
self.assertEquals(self.product.with_context(
location=self.child_test_stock_loc.id,
to_date="2019-08-10").qty_available, 0.0)
def test_wizard_current(self):
wizard = self.env['stock.quantity.history'].create({
"location_id": self.test_stock_loc.id,
"include_child_locations": False,
"compute_at_date": 0,
})
action = wizard.with_context().open_table()
self.assertEquals(action['domain'],
[('location_id', '=', self.test_stock_loc.id)])
wizard = self.env['stock.quantity.history'].create({
"location_id": self.test_stock_loc.id,
"include_child_locations": True,
"compute_at_date": 0,
"company_owned": True
})
wizard = self.wizard.open_table()
self.assertEquals(wizard['context']['location'], self.stock_loc.id)
action = wizard.with_context().open_table()
self.assertEquals(action['domain'],
[('location_id', 'child_of',
self.test_stock_loc.id)])

13
stock_quantity_history_location/wizards/stock_quantity_history.py
View File

@@ -20,12 +20,21 @@ class StockQuantityHistory(models.TransientModel):
ctx = action['context']
if isinstance(ctx, str):
ctx = ast.literal_eval(ctx)
action['domain'] = [('type', '=', 'product')]
if self.location_id:
# If we are opening the current quants, filter by domain
if self.location_id and not self.compute_at_date and not \
self.env.context.get('valuation'):
if self.include_child_locations:
action['domain'] = [
('location_id', 'child_of', self.location_id.id)]
else:
action['domain'] = [('location_id', '=', self.location_id.id)]
elif self.location_id:
ctx['location'] = self.location_id.id
ctx['compute_child'] = self.include_child_locations
if ctx.get('company_owned', False):
ctx.pop('company_owned')
# Ensure the context isn't added later and catch it
ctx['drop_company_owned'] = True
action['name'] = '%s (%s)' % (action['name'],
self.location_id.complete_name)
action['context'] = ctx