Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/16.0' into 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dhongu committed Jul 10, 2024
2 parents baaf4dc + 7ad268f commit 1b5862e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ addon | version | maintainers | summary | price
[deltatech_sale_multiple](deltatech_sale_multiple/) | 16.0.1.0.0 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Sale quantity multiple | Free
[deltatech_sale_multiple_website](deltatech_sale_multiple_website/) | 16.0.1.0.3 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Quantity multiple on website | Free
[deltatech_sale_pallet](deltatech_sale_pallet/) | 16.0.1.0.8 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Sale pallet | Free
[deltatech_sale_pallet_website](deltatech_sale_pallet_website/) | 16.0.1.0.2 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Sale pallet | Free
[deltatech_sale_pallet_website](deltatech_sale_pallet_website/) | 16.0.1.0.3 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Sale pallet | Free
[deltatech_sale_payment](deltatech_sale_payment/) | 16.0.1.0.2 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Payment button in sale order | Free
[deltatech_sale_phone](deltatech_sale_phone/) | 16.0.1.0.1 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Show partner phone in sale order | Free
[deltatech_sale_picking_status](deltatech_sale_picking_status/) | 16.0.1.0.1 | [![danila12](https://github.com/danila12.png?size=30px)](https://github.com/danila12) | Get sale order status from pickings | Free
Expand Down
2 changes: 1 addition & 1 deletion deltatech_sale_pallet_website/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Sale Pallet Website
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:06399ff53e0880eb46d8c675ddc444a2b288082022b2407c3cb43a1f059d1f10
!! source digest: sha256:2af39130797e20f65e8e043888df468d2ad62d01bd252182a7135669fe6947b5
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
Expand Down
6 changes: 2 additions & 4 deletions deltatech_sale_pallet_website/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
{
"name": "Sale Pallet Website",
"summary": "Sale pallet",
"version": "16.0.1.0.2",
"version": "16.0.1.0.3",
"author": "Terrabit, Dorin Hongu",
"website": "https://www.terrabit.ro",
"category": "Sales",
"depends": ["deltatech_sale_pallet", "website_sale"],
"license": "OPL-1",
"data": [
# "views/templates.xml"
],
"data": ["views/templates.xml"],
"images": ["static/description/main_screenshot.png"],
"development_status": "Production/Stable",
"maintainers": ["dhongu"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h1 class="title">Sale Pallet Website</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:06399ff53e0880eb46d8c675ddc444a2b288082022b2407c3cb43a1f059d1f10
!! source digest: sha256:2af39130797e20f65e8e043888df468d2ad62d01bd252182a7135669fe6947b5
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="https://www.odoo.com/documentation/master/legal/licenses.html"><img alt="License: OPL-1" src="https://img.shields.io/badge/licence-OPL--1-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/dhongu/deltatech/tree/16.0/deltatech_sale_pallet_website"><img alt="dhongu/deltatech" src="https://img.shields.io/badge/github-dhongu%2Fdeltatech-lightgray.png?logo=github" /></a></p>
<dl class="docutils">
Expand Down
8 changes: 4 additions & 4 deletions deltatech_sale_pallet_website/views/templates.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
<template
id="show_pallet_price"
inherit_id="website_sale.product"
active="False"
active="True"
customize_show="True"
name="Show Pallet Price"
priority='10'
priority="10"
>
<xpath expr="//div[@id='product_details']" position="inside">
<t t-if="product.pallet_qty_min">
<hr />
<p class="text-muted">
When buying <span t-field="product.pallet_qty_min" />
price is <span
the price is
<span
t-field="product.pallet_price"
t-options="{'widget': 'monetary', 'display_currency': product.currency_id}"
/>
</p>
</t>

</xpath>
</template>
</odoo>

0 comments on commit 1b5862e

Please sign in to comment.