Skip to content

Commit 5a57e54

Browse files
sergio-terueldalonsod
authored andcommitted
[IMP] purchase_order_secondary_unit: Add secondary units to purchase order reports
1 parent b01dd4c commit 5a57e54

File tree

10 files changed

+152
-87
lines changed

10 files changed

+152
-87
lines changed

Diff for: purchase_order_secondary_unit/README.rst

+9-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
Purchase Order Secondary Unit
33
=============================
44

5-
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5+
..
6+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
67
!! This file is generated by oca-gen-addon-readme !!
78
!! changes will be overwritten. !!
89
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10+
!! source digest: sha256:02923920b0477664970b7107c3b29878dc9b813743086e098242f9f284ae9d0f
11+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
912
1013
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
1114
:target: https://odoo-community.org/page/development-status
@@ -19,11 +22,11 @@ Purchase Order Secondary Unit
1922
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
2023
:target: https://translation.odoo-community.org/projects/purchase-workflow-15-0/purchase-workflow-15-0-purchase_order_secondary_unit
2124
:alt: Translate me on Weblate
22-
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
23-
:target: https://runbot.odoo-community.org/runbot/142/15.0
24-
:alt: Try me on Runbot
25+
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&target_branch=15.0
27+
:alt: Try me on Runboat
2528

26-
|badge1| |badge2| |badge3| |badge4| |badge5|
29+
|badge1| |badge2| |badge3| |badge4| |badge5|
2730

2831
This module extends the functionality of purchase orders to allow buy products
2932
in secondary unit of distinct category.
@@ -49,7 +52,7 @@ Bug Tracker
4952

5053
Bugs are tracked on `GitHub Issues <https://github.com/OCA/purchase-workflow/issues>`_.
5154
In case of trouble, please check there if your issue has already been reported.
52-
If you spotted it first, help us smashing it by providing a detailed and welcomed
55+
If you spotted it first, help us to smash it by providing a detailed and welcomed
5356
`feedback <https://github.com/OCA/purchase-workflow/issues/new?body=module:%20purchase_order_secondary_unit%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
5457

5558
Do not contact contributors directly about support or help with technical issues.

Diff for: purchase_order_secondary_unit/__manifest__.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Purchase Order Secondary Unit",
55
"summary": "Purchase product in a secondary unit",
6-
"version": "15.0.1.0.1",
6+
"version": "15.0.1.1.0",
77
"development_status": "Beta",
88
"category": "Purchase",
99
"website": "https://github.com/OCA/purchase-workflow",
@@ -13,5 +13,10 @@
1313
"installable": True,
1414
"auto_install": True,
1515
"depends": ["purchase", "product_secondary_unit"],
16-
"data": ["views/product_views.xml", "views/purchase_order_views.xml"],
16+
"data": [
17+
"views/product_views.xml",
18+
"views/purchase_order_views.xml",
19+
"reports/purchase_order_templates.xml",
20+
"reports/purchase_quotation_templates.xml",
21+
],
1722
}

Diff for: purchase_order_secondary_unit/i18n/de.po

+23-14
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@ msgstr ""
1616
"Plural-Forms: nplurals=2; plural=n != 1;\n"
1717
"X-Generator: Weblate 4.3.2\n"
1818

19+
#. module: purchase_order_secondary_unit
20+
#: model_terms:ir.ui.view,arch_db:purchase_order_secondary_unit.report_purchaseorder_document
21+
#: model_terms:ir.ui.view,arch_db:purchase_order_secondary_unit.report_purchasequotation_document
22+
msgid "<strong>Second Qty</strong>"
23+
msgstr ""
24+
1925
#. module: purchase_order_secondary_unit
2026
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_product__purchase_secondary_uom_id
2127
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__purchase_secondary_uom_id
2228
msgid "Default secondary unit for purchases"
2329
msgstr "Einkauf 2. ME"
2430

2531
#. module: purchase_order_secondary_unit
26-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__display_name
27-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__display_name
28-
msgid "Display Name"
29-
msgstr "Anzeigename"
30-
31-
#. module: purchase_order_secondary_unit
32-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__id
33-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__id
34-
msgid "ID"
35-
msgstr "ID"
32+
#: model:ir.model.fields,help:purchase_order_secondary_unit.field_product_product__purchase_secondary_uom_id
33+
msgid ""
34+
"In order to set a value, please first add at least one record in 'Secondary "
35+
"Unit of Measure'"
36+
msgstr ""
3637

3738
#. module: purchase_order_secondary_unit
38-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template____last_update
39-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line____last_update
40-
msgid "Last Modified on"
41-
msgstr "Zuletzt geändert am"
39+
#: model:ir.model,name:purchase_order_secondary_unit.model_product_product
40+
msgid "Product"
41+
msgstr ""
4242

4343
#. module: purchase_order_secondary_unit
4444
#: model:ir.model,name:purchase_order_secondary_unit.model_product_template
@@ -64,3 +64,12 @@ msgstr "2. ME"
6464
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__secondary_uom_qty
6565
msgid "Secondary Qty"
6666
msgstr "Menge (2. ME)"
67+
68+
#~ msgid "Display Name"
69+
#~ msgstr "Anzeigename"
70+
71+
#~ msgid "ID"
72+
#~ msgstr "ID"
73+
74+
#~ msgid "Last Modified on"
75+
#~ msgstr "Zuletzt geändert am"

Diff for: purchase_order_secondary_unit/i18n/es.po

+21-23
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,23 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: Odoo Server 11.0\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"POT-Creation-Date: 2018-10-25 21:04+0000\n"
10-
"PO-Revision-Date: 2018-10-25 23:05+0200\n"
11-
"Last-Translator: \n"
9+
"POT-Creation-Date: 2023-04-26 21:13+0000\n"
10+
"PO-Revision-Date: 2023-04-26 23:14+0200\n"
11+
"Last-Translator: Sergio Teruel <[email protected]>\n"
1212
"Language-Team: \n"
1313
"Language: es\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding: 8bit\n"
1717
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
18-
"X-Generator: Poedit 2.0.6\n"
18+
"X-Generator: Poedit 3.0.1\n"
19+
20+
#. module: purchase_order_secondary_unit
21+
#: model_terms:ir.ui.view,arch_db:purchase_order_secondary_unit.report_purchaseorder_document
22+
#: model_terms:ir.ui.view,arch_db:purchase_order_secondary_unit.report_purchasequotation_document
23+
#, fuzzy
24+
msgid "<strong>Second Qty</strong>"
25+
msgstr "<strong>Ud. secund.</strong>"
1926

2027
#. module: purchase_order_secondary_unit
2128
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_product__purchase_secondary_uom_id
@@ -24,27 +31,21 @@ msgid "Default secondary unit for purchases"
2431
msgstr "Ud de compra secundaria por defecto"
2532

2633
#. module: purchase_order_secondary_unit
27-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__display_name
28-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__display_name
29-
msgid "Display Name"
34+
#: model:ir.model.fields,help:purchase_order_secondary_unit.field_product_product__purchase_secondary_uom_id
35+
msgid ""
36+
"In order to set a value, please first add at least one record in 'Secondary "
37+
"Unit of Measure'"
3038
msgstr ""
3139

3240
#. module: purchase_order_secondary_unit
33-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__id
34-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__id
35-
msgid "ID"
36-
msgstr ""
37-
38-
#. module: purchase_order_secondary_unit
39-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template____last_update
40-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line____last_update
41-
msgid "Last Modified on"
42-
msgstr ""
41+
#: model:ir.model,name:purchase_order_secondary_unit.model_product_product
42+
msgid "Product"
43+
msgstr "Producto"
4344

4445
#. module: purchase_order_secondary_unit
4546
#: model:ir.model,name:purchase_order_secondary_unit.model_product_template
4647
msgid "Product Template"
47-
msgstr ""
48+
msgstr "Plantilla de producto"
4849

4950
#. module: purchase_order_secondary_unit
5051
#: model:ir.model,name:purchase_order_secondary_unit.model_purchase_order_line
@@ -54,17 +55,14 @@ msgstr "Línea pedido de compra"
5455
#. module: purchase_order_secondary_unit
5556
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__product_qty
5657
msgid "Quantity"
57-
msgstr ""
58+
msgstr "Cantidad"
5859

5960
#. module: purchase_order_secondary_unit
6061
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__secondary_uom_id
6162
msgid "Second unit"
62-
msgstr ""
63+
msgstr "Unidad secundaria"
6364

6465
#. module: purchase_order_secondary_unit
6566
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__secondary_uom_qty
6667
msgid "Secondary Qty"
6768
msgstr "Cdad. secundaria"
68-
69-
#~ msgid "Secondary uom"
70-
#~ msgstr "UdM Secundaría"

Diff for: purchase_order_secondary_unit/i18n/fr.po

+12-12
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@ msgstr ""
1515
"Plural-Forms: nplurals=2; plural=n > 1;\n"
1616

1717
#. module: purchase_order_secondary_unit
18-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_product__purchase_secondary_uom_id
19-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__purchase_secondary_uom_id
20-
msgid "Default secondary unit for purchases"
18+
#: model_terms:ir.ui.view,arch_db:purchase_order_secondary_unit.report_purchaseorder_document
19+
#: model_terms:ir.ui.view,arch_db:purchase_order_secondary_unit.report_purchasequotation_document
20+
msgid "<strong>Second Qty</strong>"
2121
msgstr ""
2222

2323
#. module: purchase_order_secondary_unit
24-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__display_name
25-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__display_name
26-
msgid "Display Name"
24+
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_product__purchase_secondary_uom_id
25+
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__purchase_secondary_uom_id
26+
msgid "Default secondary unit for purchases"
2727
msgstr ""
2828

2929
#. module: purchase_order_secondary_unit
30-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__id
31-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__id
32-
msgid "ID"
30+
#: model:ir.model.fields,help:purchase_order_secondary_unit.field_product_product__purchase_secondary_uom_id
31+
msgid ""
32+
"In order to set a value, please first add at least one record in 'Secondary "
33+
"Unit of Measure'"
3334
msgstr ""
3435

3536
#. module: purchase_order_secondary_unit
36-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template____last_update
37-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line____last_update
38-
msgid "Last Modified on"
37+
#: model:ir.model,name:purchase_order_secondary_unit.model_product_product
38+
msgid "Product"
3939
msgstr ""
4040

4141
#. module: purchase_order_secondary_unit

Diff for: purchase_order_secondary_unit/i18n/ja.po

+12-12
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@ msgstr ""
1515
"Plural-Forms: nplurals=1; plural=0;\n"
1616

1717
#. module: purchase_order_secondary_unit
18-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_product__purchase_secondary_uom_id
19-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__purchase_secondary_uom_id
20-
msgid "Default secondary unit for purchases"
18+
#: model_terms:ir.ui.view,arch_db:purchase_order_secondary_unit.report_purchaseorder_document
19+
#: model_terms:ir.ui.view,arch_db:purchase_order_secondary_unit.report_purchasequotation_document
20+
msgid "<strong>Second Qty</strong>"
2121
msgstr ""
2222

2323
#. module: purchase_order_secondary_unit
24-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__display_name
25-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__display_name
26-
msgid "Display Name"
24+
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_product__purchase_secondary_uom_id
25+
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__purchase_secondary_uom_id
26+
msgid "Default secondary unit for purchases"
2727
msgstr ""
2828

2929
#. module: purchase_order_secondary_unit
30-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__id
31-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__id
32-
msgid "ID"
30+
#: model:ir.model.fields,help:purchase_order_secondary_unit.field_product_product__purchase_secondary_uom_id
31+
msgid ""
32+
"In order to set a value, please first add at least one record in 'Secondary "
33+
"Unit of Measure'"
3334
msgstr ""
3435

3536
#. module: purchase_order_secondary_unit
36-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template____last_update
37-
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line____last_update
38-
msgid "Last Modified on"
37+
#: model:ir.model,name:purchase_order_secondary_unit.model_product_product
38+
msgid "Product"
3939
msgstr ""
4040

4141
#. module: purchase_order_secondary_unit

Diff for: purchase_order_secondary_unit/i18n/purchase_order_secondary_unit.pot

+6
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ msgstr ""
1313
"Content-Transfer-Encoding: \n"
1414
"Plural-Forms: \n"
1515

16+
#. module: purchase_order_secondary_unit
17+
#: model_terms:ir.ui.view,arch_db:purchase_order_secondary_unit.report_purchaseorder_document
18+
#: model_terms:ir.ui.view,arch_db:purchase_order_secondary_unit.report_purchasequotation_document
19+
msgid "<strong>Second Qty</strong>"
20+
msgstr ""
21+
1622
#. module: purchase_order_secondary_unit
1723
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_product__purchase_secondary_uom_id
1824
#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__purchase_secondary_uom_id
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo>
3+
<template
4+
id="report_purchaseorder_document"
5+
inherit_id="purchase.report_purchaseorder_document"
6+
>
7+
<!-- Header data -->
8+
<th name="th_quantity" position="before">
9+
<th name="th_secondary_unit" class="text-right"><strong
10+
>Second Qty</strong></th>
11+
</th>
12+
<!-- Content data -->
13+
<xpath expr="//span[@t-field='line.product_qty']/.." position="before">
14+
<td id="secondary_unit" class="text-right">
15+
<span t-field="line.secondary_uom_qty" />
16+
<span t-field="line.secondary_uom_id" />
17+
</td>
18+
</xpath>
19+
</template>
20+
</odoo>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo>
3+
4+
<template
5+
id="report_purchasequotation_document"
6+
inherit_id="purchase.report_purchasequotation_document"
7+
>
8+
<!-- Header data -->
9+
<th name="th_quantity" position="before">
10+
<th name="secondary_unit" class="text-right"><strong
11+
>Second Qty</strong></th>
12+
</th>
13+
<!-- Content data -->
14+
<xpath expr="//span[@t-field='order_line.product_qty']/.." position="before">
15+
<td id="secondary_unit" class="text-right">
16+
<span t-field="order_line.secondary_uom_qty" />
17+
<span t-field="order_line.secondary_uom_id" />
18+
</td>
19+
</xpath>
20+
</template>
21+
22+
</odoo>

0 commit comments

Comments
 (0)