Skip to content

Commit

Permalink
[12.0][REF] purchase_landed_cost: Rename variables
Browse files Browse the repository at this point in the history
This commit aim to :
1. Avoid confusion between product's `standard_price` (which will be mod
ified by clicking on 'Update Cost') and the sought-after "product's Landed Cost"
2. Avoid confusion between the words 'price', 'expenses' and 'cost'.
Following the idea that :
    Cost = Price + Expenses

Thus, the following changes were made :

- delete `product_price_unit` (a **related** field to stock move's
`price_unit`)
- rename `standard_price_old` into `product_price_unit` (a **calculated**
 field which give stock move's `price_unit`)
- rename `standar_price_new` into `landed_cost_unit` (and reset it to
zero when the Cost Distribution calculation is canceled)
- rename `total_amount` into `product_price_amount`
- rename `cost_ratio` into `expense_unit`
- rename `expense_unit` and `expense_amount` (in the Cost Distrib. lines
only) into `expenses_unit` and `expenses_amount` to help making the
difference from the singles `expense` in other classes.
  • Loading branch information
clementmbr committed Apr 29, 2020
1 parent 19314f5 commit f438055
Show file tree
Hide file tree
Showing 12 changed files with 109 additions and 100 deletions.
12 changes: 6 additions & 6 deletions purchase_landed_cost/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ msgid "Affected lines"
msgstr "Líneas afectadas"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__total_amount
msgid "Amount line"
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_amount
msgid "Price amount"
msgstr "Importe de línea"

#. module: purchase_landed_cost
Expand Down Expand Up @@ -496,7 +496,7 @@ msgid "Name"
msgstr "Nombre"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_new
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__landed_cost_unit
msgid "New cost"
msgstr "Nuevo coste"

Expand Down Expand Up @@ -556,7 +556,7 @@ msgid "Prev Pickings"
msgstr "Albaranes previos"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_old
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_unit
msgid "Previous cost"
msgstr "Coste previo"

Expand Down Expand Up @@ -821,8 +821,8 @@ msgid "Transfer"
msgstr "Date of Transfer"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__expense_unit
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__expense_unit
msgid "Unit cost"
msgstr "Coste unitario"

Expand Down
12 changes: 6 additions & 6 deletions purchase_landed_cost/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ msgid "Affected lines"
msgstr "Mouvement de réception affecté"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__total_amount
msgid "Amount line"
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_amount
msgid "Price amount"
msgstr "Montant total"

#. module: purchase_landed_cost
Expand Down Expand Up @@ -499,7 +499,7 @@ msgid "Name"
msgstr "Nom"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_new
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__landed_cost_unit
msgid "New cost"
msgstr "Prix d'acquisition"

Expand Down Expand Up @@ -560,7 +560,7 @@ msgid "Prev Pickings"
msgstr "Opérations précédentes"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_old
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_unit
msgid "Previous cost"
msgstr "Ancien prix de revient"

Expand Down Expand Up @@ -828,8 +828,8 @@ msgid "Transfer"
msgstr "Opération de réception"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__expense_unit
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__expense_unit
msgid "Unit cost"
msgstr "Frais unitaire"

Expand Down
12 changes: 6 additions & 6 deletions purchase_landed_cost/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ msgid "Affected lines"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__total_amount
msgid "Amount line"
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_amount
msgid "Price amount"
msgstr ""

#. module: purchase_landed_cost
Expand Down Expand Up @@ -491,7 +491,7 @@ msgid "Name"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_new
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__landed_cost_unit
msgid "New cost"
msgstr ""

Expand Down Expand Up @@ -550,7 +550,7 @@ msgid "Prev Pickings"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_old
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_unit
msgid "Previous cost"
msgstr ""

Expand Down Expand Up @@ -800,8 +800,8 @@ msgid "Transfer"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__expense_unit
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__expense_unit
msgid "Unit cost"
msgstr ""

Expand Down
12 changes: 6 additions & 6 deletions purchase_landed_cost/i18n/pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ msgid "Affected lines"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__total_amount
msgid "Amount line"
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_amount
msgid "Price amount"
msgstr ""

#. module: purchase_landed_cost
Expand Down Expand Up @@ -493,7 +493,7 @@ msgid "Name"
msgstr "Nome"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_new
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__landed_cost_unit
msgid "New cost"
msgstr ""

Expand Down Expand Up @@ -555,7 +555,7 @@ msgid "Prev Pickings"
msgstr "Separação"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_old
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_unit
msgid "Previous cost"
msgstr ""

Expand Down Expand Up @@ -806,8 +806,8 @@ msgid "Transfer"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__expense_unit
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__expense_unit
msgid "Unit cost"
msgstr ""

Expand Down
12 changes: 6 additions & 6 deletions purchase_landed_cost/i18n/purchase_landed_cost.pot
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ msgid "Affected lines"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__total_amount
msgid "Amount line"
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_amount
msgid "Price amount"
msgstr ""

#. module: purchase_landed_cost
Expand Down Expand Up @@ -481,7 +481,7 @@ msgid "Name"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_new
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__landed_cost_unit
msgid "New cost"
msgstr ""

Expand Down Expand Up @@ -540,7 +540,7 @@ msgid "Prev Pickings"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_old
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_unit
msgid "Previous cost"
msgstr ""

Expand Down Expand Up @@ -778,8 +778,8 @@ msgid "Transfer"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__expense_unit
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__expense_unit
msgid "Unit cost"
msgstr ""

Expand Down
12 changes: 6 additions & 6 deletions purchase_landed_cost/i18n/ro.po
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ msgid "Affected lines"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__total_amount
msgid "Amount line"
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_amount
msgid "Price amount"
msgstr ""

#. module: purchase_landed_cost
Expand Down Expand Up @@ -493,7 +493,7 @@ msgid "Name"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_new
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__landed_cost_unit
msgid "New cost"
msgstr ""

Expand Down Expand Up @@ -552,7 +552,7 @@ msgid "Prev Pickings"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_old
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_unit
msgid "Previous cost"
msgstr ""

Expand Down Expand Up @@ -804,8 +804,8 @@ msgid "Transfer"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__expense_unit
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__expense_unit
msgid "Unit cost"
msgstr ""

Expand Down
12 changes: 6 additions & 6 deletions purchase_landed_cost/i18n/sl.po
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ msgid "Affected lines"
msgstr "Prizadete postavke"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__total_amount
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_amount
#, fuzzy
msgid "Amount line"
msgid "Price amount"
msgstr "Po znesku postavke"

#. module: purchase_landed_cost
Expand Down Expand Up @@ -505,7 +505,7 @@ msgid "Name"
msgstr "Naziv"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_new
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__landed_cost_unit
#, fuzzy
msgid "New cost"
msgstr "Stroški iztovarjanja"
Expand Down Expand Up @@ -569,7 +569,7 @@ msgid "Prev Pickings"
msgstr "Prejšnji zbirniki"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_old
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_unit
msgid "Previous cost"
msgstr "Prejšnji stroški"

Expand Down Expand Up @@ -834,8 +834,8 @@ msgid "Transfer"
msgstr ""

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__expense_unit
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__expense_unit
msgid "Unit cost"
msgstr "Cena enote"

Expand Down
12 changes: 6 additions & 6 deletions purchase_landed_cost/i18n/zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ msgid "Affected lines"
msgstr "受影响的行"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__total_amount
msgid "Amount line"
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_amount
msgid "Price amount"
msgstr "总计"

#. module: purchase_landed_cost
Expand Down Expand Up @@ -486,7 +486,7 @@ msgid "Name"
msgstr "名称"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_new
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__landed_cost_unit
msgid "New cost"
msgstr "新的成本"

Expand Down Expand Up @@ -545,7 +545,7 @@ msgid "Prev Pickings"
msgstr "上一个拣货"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__standard_price_old
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__product_price_unit
msgid "Previous cost"
msgstr "以前的费用"

Expand Down Expand Up @@ -784,8 +784,8 @@ msgid "Transfer"
msgstr "调拨"

#. module: purchase_landed_cost
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__cost_ratio
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line__expense_unit
#: model:ir.model.fields,field_description:purchase_landed_cost.field_purchase_cost_distribution_line_expense__expense_unit
msgid "Unit cost"
msgstr "单位成本"

Expand Down
Loading

0 comments on commit f438055

Please sign in to comment.