diff --git a/addons/l10n_in_pos/models/pos_session.py b/addons/l10n_in_pos/models/pos_session.py index 89ce76d09a6..189c77b9510 100644 --- a/addons/l10n_in_pos/models/pos_session.py +++ b/addons/l10n_in_pos/models/pos_session.py @@ -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: diff --git a/addons/l10n_in_pos/static/src/overrides/models/order.js b/addons/l10n_in_pos/static/src/overrides/models/order.js index 2fd35dec41e..e647a248bdf 100644 --- a/addons/l10n_in_pos/static/src/overrides/models/order.js +++ b/addons/l10n_in_pos/static/src/overrides/models/order.js @@ -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(); } diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot index e3dd330e2f9..c120941b9e0 100644 --- a/addons/point_of_sale/i18n/point_of_sale.pot +++ b/addons/point_of_sale/i18n/point_of_sale.pot @@ -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 diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/product_info_popup/product_info_popup.xml b/addons/point_of_sale/static/src/app/screens/product_screen/product_info_popup/product_info_popup.xml index 639eb4823a3..214693b4291 100644 --- a/addons/point_of_sale/static/src/app/screens/product_screen/product_info_popup/product_info_popup.xml +++ b/addons/point_of_sale/static/src/app/screens/product_screen/product_info_popup/product_info_popup.xml @@ -28,7 +28,7 @@
- + @@ -120,7 +120,7 @@
Price excl. VAT:Price excl. Tax:
- + diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml index 4fd3c8ca645..d16bcd85a09 100644 --- a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml +++ b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml @@ -64,9 +64,9 @@
- VAT% - VAT - ExVAT + TAX% + Tax + Base Total diff --git a/addons/point_of_sale/views/report_saledetails.xml b/addons/point_of_sale/views/report_saledetails.xml index fae91dd4cc1..ee1b87714bc 100644 --- a/addons/point_of_sale/views/report_saledetails.xml +++ b/addons/point_of_sale/views/report_saledetails.xml @@ -46,7 +46,7 @@
- + @@ -162,7 +162,7 @@ - +
Total Price excl. VAT:Total Price excl. Tax:
Product Category Product QuantityTotal (VAT excluded)Total (Tax excluded)
Product Category Product QuantityTotal (VAT excluded)Total (Tax excluded)