Skip to content

[18.0][IMP] sync modules from OCA #99

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

Closed
AungKoKoLin1997 wants to merge 1 commit into from
Closed

[18.0][IMP] sync modules from OCA #99

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 purchase_order_secondary_unit/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Purchase Order Secondary Unit
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:2b71909b287e9e5c437aea172c4c165ed1bee7b3e981d1c44d99c8bfaae5740d
!! source digest: sha256:931f6f1aa647d4627f4c32d5a657bb5fcbfef63f595c2c84f0790ff27a44ee7d
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion purchase_order_secondary_unit/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "Purchase Order Secondary Unit",
"summary": "Purchase product in a secondary unit",
"version": "18.0.1.2.1",
"version": "18.0.1.2.2",
"development_status": "Beta",
"category": "Purchase",
"website": "https://github.com/OCA/purchase-workflow",
Expand Down
4 changes: 3 additions & 1 deletion purchase_order_secondary_unit/reports/purchase_order_templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
name="th_secondary_unit"
class="text-end"
t-if="not o.company_id.hide_secondary_uom_column(o)"
groups="uom.group_uom"
>
<strong>Second Qty</strong>
</th>
Expand All @@ -20,6 +21,7 @@
id="secondary_unit"
class="text-end"
t-if="not o.company_id.hide_secondary_uom_column(o)"
groups="uom.group_uom"
>
<span t-field="line.secondary_uom_qty" />
<span t-field="line.secondary_uom_id" />
Expand All @@ -40,7 +42,7 @@
<xpath expr="//span[@t-field='line.product_uom.name']" position="after">
<t t-if="line.get_secondary_uom_display_mode() == 'secondary'">
<span t-field="line.secondary_uom_qty" />
<span t-field="line.secondary_uom_id.name" />
<span t-field="line.secondary_uom_id.name" groups="uom.group_uom" />
</t>
</xpath>
<!-- Quantity: add secondary qty ('both' mode) -->
Expand Down
7 changes: 6 additions & 1 deletion purchase_order_secondary_unit/reports/purchase_quotation_templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
name="secondary_unit"
class="text-end"
t-if="not o.company_id.hide_secondary_uom_column(o)"
groups="uom.group_uom"
>
<strong>Second Qty</strong>
</th>
Expand All @@ -20,6 +21,7 @@
id="secondary_unit"
class="text-end"
t-if="not o.company_id.hide_secondary_uom_column(o)"
groups="uom.group_uom"
>
<span t-field="order_line.secondary_uom_qty" />
<span t-field="order_line.secondary_uom_id" />
Expand All @@ -40,7 +42,10 @@
<xpath expr="//span[@t-field='order_line.product_uom']" position="after">
<t t-if="order_line.get_secondary_uom_display_mode() == 'secondary'">
<span t-field="order_line.secondary_uom_qty" />
<span t-field="order_line.secondary_uom_id.name" />
<span
t-field="order_line.secondary_uom_id.name"
groups="uom.group_uom"
/>
</t>
</xpath>
<!-- Quantity: add secondary qty ('both' mode) -->
Expand Down
2 changes: 1 addition & 1 deletion purchase_order_secondary_unit/static/description/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Purchase Order Secondary Unit</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:2b71909b287e9e5c437aea172c4c165ed1bee7b3e981d1c44d99c8bfaae5740d
!! source digest: sha256:931f6f1aa647d4627f4c32d5a657bb5fcbfef63f595c2c84f0790ff27a44ee7d
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" 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 image-reference" 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 image-reference" href="https://github.com/OCA/purchase-workflow/tree/18.0/purchase_order_secondary_unit"><img alt="OCA/purchase-workflow" src="https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/purchase-workflow-18-0/purchase-workflow-18-0-purchase_order_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module extends the functionality of purchase orders to allow buy
Expand Down
Loading