Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[13.0][FIX] stock_valuation: purchase and sale other currencies support #151

Open
wants to merge 1 commit into
base: 13.0
Choose a base branch
from
Open

[13.0][FIX] stock_valuation: purchase and sale other currencies support #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stock_valuation/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
""",
"author": "Solvos",
"license": "LGPL-3",
"version": "13.0.3.4.0",
"version": "13.0.3.4.1",
"category": "stock",
"website": "https://github.com/solvosci/slv-stock",
"depends": [
Expand Down
42 changes: 36 additions & 6 deletions stock_valuation/models/stock_valuation_layer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,17 @@ class StockValuationLayer(models.Model):
string="Partner",
)

orig_currency_id = fields.Many2one(
comodel_name="res.currency",
readonly=True,
string="Original Currency",
)
orig_currency_unit_cost = fields.Monetary(
currency_field="orig_currency_id",
readonly=True,
string="Unit Cost - In original currency",
)

@api.model
def create(self, vals):
if vals.get("stock_move_id"):
Expand Down Expand Up @@ -122,8 +133,8 @@ def create(self, vals):
# Purchase order (original or "2*N return")
# if not move_id.origin_returned_move_id:
if move_id.purchase_line_id:
# vals["unit_cost"] = move_id.price_unit
vals["unit_cost"] = move_id.purchase_line_id.price_unit
# vals["unit_cost"] = move_id.purchase_line_id.price_unit
vals.update(self._get_unit_cost_dict(move_id.purchase_line_id))
vals["value"] = vals.get("unit_cost") * vals.get("quantity")
vals["accumulated"] = True
# Sale return "2*N + 1"
Expand All @@ -133,8 +144,8 @@ def create(self, vals):
# sale move valuation, not order line
# Anyway, this will recalculated later (in
# phap._update_dependent_svls ??)
# vals["unit_cost"] = orig_move.sale_line_id.price_unit
vals["unit_cost"] = move_id.sale_line_id.price_unit
# vals["unit_cost"] = move_id.sale_line_id.price_unit
vals.update(self._get_unit_cost_dict(move_id.sale_line_id))
vals["value"] = vals.get("unit_cost") * vals.get("quantity")
# TODO this should be return always a value,
# but False is possible!!!
Expand All @@ -153,8 +164,8 @@ def create(self, vals):
# Purchase return "2*N + 1"
else:
# orig_move = move_id.origin_returned_move_id
# vals["unit_cost"] = orig_move.price_unit
vals["unit_cost"] = move_id.purchase_line_id.price_unit
# vals["unit_cost"] = move_id.purchase_line_id.price_unit
vals.update(self._get_unit_cost_dict(move_id.purchase_line_id))
quantity = -quantity
vals["value"] = vals.get("unit_cost") * quantity
vals["accumulated"] = True
Expand Down Expand Up @@ -285,3 +296,22 @@ def product_history_link(self, product_id, warehouse_id, average_price, quantity
# subsequent_records.recalculation_average_price(quantity, average_price, value, history_average)

return history_average.id

def _get_unit_cost_dict(self, object):
"""
Obtains unit costs and currency values for purchase or sales lines
"""
uc_dict = {"unit_cost": object.price_unit}
if object.order_id.currency_id != object.order_id.company_id.currency_id:
uc_dict.update({
"orig_currency_id": object.order_id.currency_id.id,
"orig_currency_unit_cost": object.price_unit,
"unit_cost": object.order_id.currency_id._convert(
object.price_unit,
object.order_id.company_id.currency_id,
object.order_id.company_id,
object.date_order or fields.Date.today(),
round=False,
)
})
return uc_dict
29 changes: 29 additions & 0 deletions stock_valuation/views/stock_valuation_layer_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@
</xpath>
<xpath expr="//field[@name='uom_id']" position="after">
<field name="unit_cost" />
<field name="orig_currency_id" invisible="1" />
<field
name="orig_currency_unit_cost"
widget="monetary"
optional="hide"
attrs="{
'invisible': [('orig_currency_id', '=', False)],
}"
string="In Currency"
/>
</xpath>
<xpath expr="//field[@name='value']" position="after">
<field name="average_price" groups="base.group_no_one" />
Expand Down Expand Up @@ -72,6 +82,14 @@
<field name="document_origin" />
<field name="move_reference" />
</xpath>
<xpath expr="//filter[@name='inactive']" position="before">
<filter
string="Original in other currency"
name="with_orig_currency"
domain="[('orig_currency_id','!=', False)]"
/>
<separator/>
</xpath>
<xpath expr="//filter[@name='group_by_product_id']" position="after">
<filter string="Warehouse" name="group_by_warehouse_id" context="{'group_by': 'warehouse_id'}"/>
<filter string="Type" name="group_by_origin_type" context="{'group_by': 'origin_type'}"/>
Expand All @@ -88,6 +106,17 @@
<field name="create_date_valuation" />
<field name="warehouse_valuation" invisible="1" />
</xpath>
<xpath expr="//field[@name='unit_cost']" position="after">
<field name="orig_currency_id" invisible="1" />
<field
name="orig_currency_unit_cost"
widget="monetary"
attrs="{
'invisible': [('orig_currency_id', '=', False)],
}"
string="In Currency"
/>
</xpath>
<xpath expr="//notebook/page[1]" position="after">
<page
name="valuation_extra"
Expand Down