pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] point_of_sale, l10n_in_pos: change label VAT -> Tax, show tax info on ticket

Browse Source 
point_of_sale:
This commit changes label `VAT` -> `Tax`
because VAT is to be specific where other
countries do use other taxes i.e. `GST` changing
it to `Tax` makes it more generic

l10n_in_pos:

In India, it is mandatory to show the tax info

This commit solves the issue where tax info was missing
on POS ticket

closes odoo/odoo#155699

Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
This commit is contained in:
Harsh Modi
2024-03-04 08:11:57 +00:00
parent de702b0071
commit 7d27c255aa
6 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_in_pos/models/pos_session.py
+5
View File
@@ -12,6 +12,11 @@ class PosSession(models.Model):
result['search_params']['fields'].append('l10n_in_hsn_code')
return result
def _loader_params_account_tax(self):
account_tax_params = super()._loader_params_account_tax()
account_tax_params['search_params']['fields'].append('tax_group_id')
return account_tax_params
@api.model
def _load_onboarding_main_config_data(self, shop_config):
if shop_config.company_id.country_code == 'IN' and not shop_config.company_id.state_id:
addons/l10n_in_pos/static/src/overrides/models/order.js
+5
View File
@@ -6,6 +6,11 @@ import { patch } from "@web/core/utils/patch";
patch(Order.prototype, {
export_for_printing() {
const result = super.export_for_printing(...arguments);
if (this.pos.company.country.code === 'IN') {
result.tax_details.forEach((tax) => {
tax.tax.letter = tax.tax.tax_group_id[1]
})
}
if (this.get_partner()) {
result.partner = this.get_partner();
}
addons/point_of_sale/i18n/point_of_sale.pot
+25 -26
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 17.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-01-29 10:44+0000\n"
"PO-Revision-Date: 2024-01-29 10:44+0000\n"
"POT-Creation-Date: 2024-02-28 07:10+0000\n"
"PO-Revision-Date: 2024-02-28 07:10+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -1023,6 +1023,13 @@ msgstr ""
msgid "Barcode Scanner/Card Reader"
msgstr ""
#. module: point_of_sale
#. odoo-javascript
#: code:addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml:0
#, python-format
msgid "Base"
msgstr ""
#. module: point_of_sale
#: model_terms:ir.ui.view,arch_db:point_of_sale.report_saledetails
msgid "Base Amount"
@@ -2522,13 +2529,6 @@ msgstr ""
msgid "Error: no internet connection."
msgstr ""
#. module: point_of_sale
#. odoo-javascript
#: code:addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml:0
#, python-format
msgid "ExVAT"
msgstr ""
#. module: point_of_sale
#. odoo-javascript
#: code:addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js:0
@@ -3074,11 +3074,14 @@ msgid "Invoice payment for %s (%s) using %s"
msgstr ""
#. module: point_of_sale
#. odoo-javascript
#: code:addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js:0
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order__invoiced
#: model:ir.model.fields.selection,name:point_of_sale.selection__pos_order__state__invoiced
#: model:ir.model.fields.selection,name:point_of_sale.selection__report_pos_order__state__invoiced
#: model_terms:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter
#: model_terms:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
#, python-format
msgid "Invoiced"
msgstr ""
@@ -3973,6 +3976,7 @@ msgid ""
msgstr ""
#. module: point_of_sale
#. odoo-python
#: code:addons/point_of_sale/models/pos_config.py:0
#, python-format
msgid "Only administrators can edit receipt headers and footers"
@@ -5091,6 +5095,7 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_res_config_settings__module_pos_preparation_display
#: model:ir.ui.menu,name:point_of_sale.menu_pos_preparation_display
#: model_terms:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
msgid "Preparation Display"
msgstr ""
@@ -5139,7 +5144,7 @@ msgstr ""
#. odoo-javascript
#: code:addons/point_of_sale/static/src/app/screens/product_screen/product_info_popup/product_info_popup.xml:0
#, python-format
msgid "Price excl. VAT:"
msgid "Price excl. Tax:"
msgstr ""
#. module: point_of_sale
@@ -6600,6 +6605,13 @@ msgstr ""
msgid "Synchronisation Error"
msgstr ""
#. module: point_of_sale
#. odoo-javascript
#: code:addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml:0
#, python-format
msgid "TAX%"
msgstr ""
#. module: point_of_sale
#. odoo-javascript
#: code:addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml:0
@@ -6610,6 +6622,7 @@ msgstr ""
#. module: point_of_sale
#. odoo-javascript
#: code:addons/point_of_sale/static/src/app/screens/product_screen/control_buttons/fiscal_position_button/fiscal_position_button.js:0
#: code:addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml:0
#: model:ir.model,name:point_of_sale.model_account_tax
#, python-format
msgid "Tax"
@@ -7405,7 +7418,7 @@ msgstr ""
#. module: point_of_sale
#: model_terms:ir.ui.view,arch_db:point_of_sale.report_saledetails
msgid "Total (VAT excluded)"
msgid "Total (Tax excluded)"
msgstr ""
#. module: point_of_sale
@@ -7458,7 +7471,7 @@ msgstr ""
#. odoo-javascript
#: code:addons/point_of_sale/static/src/app/screens/product_screen/product_info_popup/product_info_popup.xml:0
#, python-format
msgid "Total Price excl. VAT:"
msgid "Total Price excl. Tax:"
msgstr ""
#. module: point_of_sale
@@ -7717,20 +7730,6 @@ msgstr ""
msgid "Uuid"
msgstr ""
#. module: point_of_sale
#. odoo-javascript
#: code:addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml:0
#, python-format
msgid "VAT"
msgstr ""
#. module: point_of_sale
#. odoo-javascript
#: code:addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml:0
#, python-format
msgid "VAT%"
msgstr ""
#. module: point_of_sale
#. odoo-javascript
#: code:addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.xml:0
addons/point_of_sale/static/src/app/screens/product_screen/product_info_popup/product_info_popup.xml
+2 -2
View File
@@ -28,7 +28,7 @@
<div class="section-financials-body d-flex flex-column flex-sm-row">
<table class="table table-borderless mb-0">
<tr>
<td>Price excl. VAT:</td>
<td>Price excl. Tax:</td>
<td><t t-esc="env.utils.formatCurrency(productInfo.all_prices.price_without_tax)"/></td>
</tr>
<tr t-if="_hasMarginsCostsAccessRights()">
@@ -120,7 +120,7 @@
<div class="section-order-body">
<table class="table table-borderless w-100 w-sm-50 mb-0">
<tr>
<td>Total Price excl. VAT:</td>
<td>Total Price excl. Tax:</td>
<td t-esc="orderPriceWithoutTaxCurrency" class="table-value"/>
</tr>
<tr t-if="_hasMarginsCostsAccessRights()">
addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
+3 -3
View File
@@ -64,9 +64,9 @@
</t>
<div t-if="props.data.tax_details.length > 0" class="pos-receipt-taxes">
<span />
<span>VAT%</span>
<span>VAT</span>
<span>ExVAT</span>
<span>TAX%</span>
<span>Tax</span>
<span>Base</span>
<span>Total</span>
<t t-foreach="props.data.tax_details" t-as="tax" t-key="tax.tax.id">
<span t-esc="tax.tax.letter || ''"/>
addons/point_of_sale/views/report_saledetails.xml
+2 -2
View File
@@ -46,7 +46,7 @@
<th class="text-start">Product Category</th>
<th class="text-start">Product</th>
<th class="text-end">Quantity</th>
<th class="text-end">Total (VAT excluded)</th>
<th class="text-end">Total (Tax excluded)</th>
</tr></thead>
<tbody>
<tr t-foreach="products" t-as="category">
@@ -162,7 +162,7 @@
<th class="text-start">Product Category</th>
<th class="text-start">Product</th>
<th class="text-end">Quantity</th>
<th class="text-end">Total (VAT excluded)</th>
<th class="text-end">Total (Tax excluded)</th>
</tr></thead>
<tbody>
<tr t-foreach="refund_products" t-as="category">