[PATCH] Upstream patch - 31072022

addons/account/models/account_bank_statement.py

@@ -297,42 +297,58 @@ class AccountBankStatement(models.Model):
             st_line.currency_id = self.journal_id.currency_id or self.company_id.currency_id
 
     def _check_balance_end_real_same_as_computed(self):
-        ''' Check the balance_end_real (encoded manually by the user) is equals to the balance_end (computed by flectra).
-        In case of a cash statement, the different is set automatically to a profit/loss account.
-        '''
-        for stmt in self:
-            if not stmt.currency_id.is_zero(stmt.difference):
-                if stmt.journal_type == 'cash':
-                    st_line_vals = {
-                        'statement_id': stmt.id,
-                        'journal_id': stmt.journal_id.id,
-                        'amount': stmt.difference,
-                        'date': stmt.date,
-                    }
+        """ Check the balance_end_real (encoded manually by the user) is equals to the balance_end (computed by flectra). """
+        return self._check_cash_balance_end_real_same_as_computed() and self._check_bank_balance_end_real_same_as_computed()
 
-                    if stmt.difference < 0.0:
-                        if not stmt.journal_id.loss_account_id:
-                            raise UserError(_('Please go on the %s journal and define a Loss Account. This account will be used to record cash difference.', stmt.journal_id.name))
+    def _check_cash_balance_end_real_same_as_computed(self):
+        """ Check the balance_end_real (encoded manually by the user) is equals to the balance_end (computed by flectra).
+            For a cash statement, if there is a difference, the different is set automatically to a profit/loss account.
+        """
+        for statement in self.filtered(lambda stmt: stmt.journal_type == 'cash'):
+            if not statement.currency_id.is_zero(statement.difference):
+                st_line_vals = {
+                    'statement_id': statement.id,
+                    'journal_id': statement.journal_id.id,
+                    'amount': statement.difference,
+                    'date': statement.date,
+                }
 
-                        st_line_vals['payment_ref'] = _("Cash difference observed during the counting (Loss)")
-                        st_line_vals['counterpart_account_id'] = stmt.journal_id.loss_account_id.id
-                    else:
-                        # statement.difference > 0.0
-                        if not stmt.journal_id.profit_account_id:
-                            raise UserError(_('Please go on the %s journal and define a Profit Account. This account will be used to record cash difference.', stmt.journal_id.name))
+                if statement.currency_id.compare_amounts(statement.difference, 0.0) < 0.0:
+                    if not statement.journal_id.loss_account_id:
+                        raise UserError(_(
+                            "Please go on the %s journal and define a Loss Account. "
+                            "This account will be used to record cash difference.",
+                            statement.journal_id.name
+                        ))
 
-                        st_line_vals['payment_ref'] = _("Cash difference observed during the counting (Profit)")
-                        st_line_vals['counterpart_account_id'] = stmt.journal_id.profit_account_id.id
-
-                    self.env['account.bank.statement.line'].create(st_line_vals)
+                    st_line_vals['payment_ref'] = _("Cash difference observed during the counting (Loss)")
+                    st_line_vals['counterpart_account_id'] = statement.journal_id.loss_account_id.id
                 else:
-                    balance_end_real = formatLang(self.env, stmt.balance_end_real, currency_obj=stmt.currency_id)
-                    balance_end = formatLang(self.env, stmt.balance_end, currency_obj=stmt.currency_id)
-                    raise UserError(_(
-                        'The ending balance is incorrect !\nThe expected balance (%(real_balance)s) is different from the computed one (%(computed_balance)s).',
-                        real_balance=balance_end_real,
-                        computed_balance=balance_end
-                    ))
+                    # statement.difference > 0.0
+                    if not statement.journal_id.profit_account_id:
+                        raise UserError(_(
+                            "Please go on the %s journal and define a Profit Account. "
+                            "This account will be used to record cash difference.",
+                            statement.journal_id.name
+                        ))
+
+                    st_line_vals['payment_ref'] = _("Cash difference observed during the counting (Profit)")
+                    st_line_vals['counterpart_account_id'] = statement.journal_id.profit_account_id.id
+
+                self.env['account.bank.statement.line'].create(st_line_vals)
+        return True
+
+    def _check_bank_balance_end_real_same_as_computed(self):
+        """ Check the balance_end_real (encoded manually by the user) is equals to the balance_end (computed by flectra). """
+        for statement in self.filtered(lambda stmt: stmt.journal_type == 'bank'):
+            if not statement.currency_id.is_zero(statement.difference):
+                balance_end_real = formatLang(self.env, statement.balance_end_real, currency_obj=statement.currency_id)
+                balance_end = formatLang(self.env, statement.balance_end, currency_obj=statement.currency_id)
+                raise UserError(_(
+                    'The ending balance is incorrect !\nThe expected balance (%(real_balance)s) is different from the computed one (%(computed_balance)s).',
+                    real_balance=balance_end_real,
+                    computed_balance=balance_end
+                ))
         return True
 
     def unlink(self):
@@ -399,7 +415,7 @@ class AccountBankStatement(models.Model):
         if any(statement.state != 'open' for statement in self):
             raise UserError(_("Only new statements can be posted."))
 
-        self._check_balance_end_real_same_as_computed()
+        self._check_cash_balance_end_real_same_as_computed()
 
         for statement in self:
             if not statement.name:

addons/account/tests/test_account_bank_statement.py

@@ -294,6 +294,44 @@ class TestAccountBankStatement(TestAccountBankStatementCommon):
             'is_reconciled': True,
         }])
 
+    def test_bank_statement_with_difference(self):
+        """ Test that a bank statement with difference could be posted but not validated. """
+        bank_statement = self.env['account.bank.statement'].create({
+            'name': 'test_statement',
+            'date': '2019-01-01',
+            'journal_id': self.bank_journal_1.id,
+            'balance_start': 10.0,
+            'balance_end_real': 100.0,
+            'balance_end': 10.0,
+            'line_ids': [(0, 0, {
+                'date': fields.Date.to_date('2019-01-01'),
+                'payment_ref': 'transaction_abc',
+                'amount': 10,
+                'partner_id': self.partner_a.id,
+            })]
+        })
+        bank_statement.button_post()
+        # Check if the bank statement is well posted (No check on the balance as the balance could be edited after).
+        self.assertEqual(bank_statement.state, 'posted')
+
+        # Check that the bank statement couldn't be validated with balance_end != balance_end_real
+        with self.assertRaises(UserError):
+            bank_statement.button_validate()
+
+        # Check if we can validate the bank statement if balance_end == balance_end_real
+        bank_statement.balance_end_real = bank_statement.balance_end
+        for line in bank_statement.line_ids:
+            line.reconcile([{
+                'name': line.payment_ref,
+                'partner_id': line.partner_id.id,
+                'currency_id': self.currency_1.id,
+                'account_id': bank_statement.journal_id.suspense_account_id.id,
+                'debit': 10.0,
+                'credit': 0.0,
+                'amount_currency': 10.0,
+            }])
+        bank_statement.button_validate()
+        self.assertEqual(bank_statement.state, 'confirm')
 
 @tagged('post_install', '-at_install')
 class TestAccountBankStatementLine(TestAccountBankStatementCommon):

addons/delivery/models/delivery_carrier.py

@@ -157,6 +157,17 @@ class DeliveryCarrier(models.Model):
         self.ensure_one()
         if hasattr(self, '%s_rate_shipment' % self.delivery_type):
             res = getattr(self, '%s_rate_shipment' % self.delivery_type)(order)
+            # apply fiscal position
+            company = self.company_id or order.company_id or self.env.company
+            res['price'] = self.product_id._get_tax_included_unit_price(
+                company,
+                company.currency_id,
+                order.date_order,
+                'sale',
+                fiscal_position=order.fiscal_position_id,
+                product_price_unit=res['price'],
+                product_currency=company.currency_id
+            )
             # apply margin on computed price
             res['price'] = float(res['price']) * (1.0 + (self.margin / 100.0))
             # save the real price in case a free_over rule overide it to 0

addons/delivery/tests/test_delivery_cost.py

@@ -238,3 +238,64 @@ class TestDeliveryCost(common.TransactionCase):
                                           ('product_id', '=', self.normal_delivery.product_id.id)])
         self.assertEqual(len(line), 1, "Delivery cost hasn't been added to SO")
         self.assertEqual(line.price_subtotal, 5.0, "Delivery cost does not correspond to 5.0")
+
+    def test_01_taxes_on_delivery_cost(self):
+
+        # Creating taxes and fiscal position
+
+        tax_price_include = self.env['account.tax'].create({
+            'name': '10% inc',
+            'type_tax_use': 'sale',
+            'amount_type': 'percent',
+            'amount': 10,
+            'price_include': True,
+            'include_base_amount': True,
+        })
+        tax_price_exclude = self.env['account.tax'].create({
+            'name': '15% exc',
+            'type_tax_use': 'sale',
+            'amount_type': 'percent',
+            'amount': 15,
+        })
+
+        fiscal_position = self.env['account.fiscal.position'].create({
+            'name': 'fiscal_pos_a',
+            'tax_ids': [
+                (0, None, {
+                    'tax_src_id': tax_price_include.id,
+                    'tax_dest_id': tax_price_exclude.id,
+                }),
+            ],
+        })
+
+        # Setting tax on delivery product
+        self.normal_delivery.product_id.taxes_id = tax_price_include
+
+        # Create sales order
+        order_form = Form(self.env['sale.order'].with_context(tracking_disable=True))
+        order_form.partner_id = self.partner_18
+        order_form.pricelist_id = self.pricelist
+        order_form.fiscal_position_id = fiscal_position
+
+        # Try adding delivery product as a normal product
+        with order_form.order_line.new() as line:
+            line.product_id = self.normal_delivery.product_id
+            line.product_uom_qty = 1.0
+            line.product_uom = self.product_uom_unit
+        sale_order = order_form.save()
+
+        self.assertRecordValues(sale_order.order_line, [{'price_subtotal': 9.09, 'price_total': 10.45}])
+
+        # Now trying to add the delivery line using the delivery wizard, the results should be the same as before
+        delivery_wizard = Form(self.env['choose.delivery.carrier'].with_context(default_order_id=sale_order.id,
+                          default_carrier_id=self.normal_delivery.id))
+        choose_delivery_carrier = delivery_wizard.save()
+        choose_delivery_carrier.button_confirm()
+
+        line = self.SaleOrderLine.search([
+            ('order_id', '=', sale_order.id),
+            ('product_id', '=', self.normal_delivery.product_id.id),
+            ('is_delivery', '=', True)
+        ])
+
+        self.assertRecordValues(line, [{'price_subtotal': 9.09, 'price_total': 10.45}])

addons/l10n_it_edi/data/invoice_it_template.xml

@@ -132,7 +132,7 @@
                     <BolloVirtuale>SI</BolloVirtuale>
                     <ImportoBollo t-esc="format_numbers(record.l10n_it_stamp_duty)"/>
                 </DatiBollo>
-                <ImportoTotaleDocumento t-esc="format_monetary(record.amount_total, currency)"/>
+                <ImportoTotaleDocumento t-esc="format_monetary(document_total, currency)"/>
             </DatiGeneraliDocumento>
             <DatiOrdineAcquisto t-if="record.ref">
                 <IdDocumento t-esc="format_alphanumeric(record.ref[:20])"/>
@@ -176,7 +176,7 @@
                     <IstitutoFinanziario t-if="partner_bank.bank_id" t-esc="format_alphanumeric(partner_bank.bank_id.name[:80])"/>
                     <IBAN t-if="partner_bank.acc_type == 'iban'" t-esc="partner_bank.sanitized_acc_number"/>
                     <BIC t-elif="partner_bank.acc_type == 'bank' and partner_bank.bank_id.bic" t-esc="partner_bank.bank_id.bic"/>
-                    <CodicePagamento t-esc="format_alphanumeric(record.payment_reference[:60])"/>
+                    <CodicePagamento t-if="record.payment_reference" t-esc="format_alphanumeric(record.payment_reference[:60])"/>
                 </DettaglioPagamento>
             </t>
         </DatiPagamento>

addons/l10n_it_edi/models/account_invoice.py

@@ -183,6 +183,12 @@ class AccountMove(models.Model):
             or (partner.country_id.code == 'IT' and '0000000')
             or 'XXXXXXX')
 
+        # Self-invoices are technically -100%/+100% repartitioned
+        # but functionally need to be exported as 100%
+        document_total = self.amount_total
+        if is_self_invoice:
+            document_total += sum([v['tax_amount_currency'] for k, v in tax_details['tax_details'].items()])
+
         # Create file content.
         template_values = {
             'record': self,
@@ -196,6 +202,7 @@ class AccountMove(models.Model):
             'seller': seller,
             'seller_partner': company.partner_id if not is_self_invoice else partner,
             'currency': self.currency_id or self.company_currency_id,
+            'document_total': document_total,
             'representative': company.l10n_it_tax_representative_partner_id,
             'codice_destinatario': codice_destinatario,
             'regime_fiscale': company.l10n_it_tax_system if not is_self_invoice else 'RF01',

addons/l10n_it_edi_sdicoop/tests/expected_xmls/reverse_charge_bill.xml

@@ -54,7 +54,7 @@
                 <Divisa>EUR</Divisa>
                 <Data>2022-03-24</Data>
                 <Numero>BILL/2022/03/0001</Numero>
-                <ImportoTotaleDocumento>1600.80</ImportoTotaleDocumento>
+                <ImportoTotaleDocumento>1808.91</ImportoTotaleDocumento>
             </DatiGeneraliDocumento>
         </DatiGenerali>
         <DatiBeniServizi>

addons/l10n_lu/i18n_extra/de.po

@@ -154,7 +154,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1a_overall_turnover
 msgid "012 - Overall turnover"
-msgstr ""
+msgstr "012 - Gesamtumsatz"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_2_export
@@ -164,7 +164,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1b_2_export
 msgid "014 - Exports"
-msgstr ""
+msgstr "014 - Ausfuhren"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_3_other_exemptions_art_43
@@ -174,7 +174,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1b_3_other_exemptions_art_43
 msgid "015 - Other exemptions"
-msgstr ""
+msgstr "015 - Andere Befreiungen"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_4_other_exemptions_art_44_et_56quater
@@ -184,7 +184,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1b_4_other_exemptions_art_44_et_56quater
 msgid "016 - Other exemptions"
-msgstr ""
+msgstr "016 - Andere Befreiungen"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_5_manufactured_tobacco_vat_collected
@@ -197,6 +197,8 @@ msgid ""
 "017 - Manufactured tobacco whose VAT was collected at the source or at the "
 "exit of the tax..."
 msgstr ""
+"017 - Tabakwaren, deren Mehrwertsteuer an der Quelle oder am Ausgang des "
+"Steuerlagers gemeinsam mit den Verbrauchsteuern erhoben wurde"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_6_a_subsequent_to_intra_community
@@ -209,6 +211,8 @@ msgid ""
 "018 - Supply, subsequent to intra-Community acquisitions of goods, in the "
 "context of triangular transactions, when the customer identified,..."
 msgstr ""
+"018 - An innergemeinschaftliche Erwerbe anschließende Lieferungen im Rahmen von "
+"Dreiecksgeschäften..."
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_6_d_supplies_other_referred
@@ -218,17 +222,17 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1b_6_d_supplies_other_referred
 msgid "019 - Supplies other than referred to in 018 and 423 or 424"
-msgstr ""
+msgstr "019 - Andere im Ausland getätigte (steuerpflichtige) Umsätze"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1b_exemptions_deductible_amounts
 msgid "021 - Exemptions and deductible amounts"
-msgstr ""
+msgstr "021 - Steuerbefreiungen und abzugsfähige Beträge"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1c_taxable_turnover
 msgid "022 - Taxable turnover"
-msgstr ""
+msgstr "022 - Steuerpflichtiger Umsatz"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_base_3
@@ -238,7 +242,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_base_3
 msgid "031 - base 3%"
-msgstr ""
+msgstr "031 - Besteuerungsgrundlage 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_base_0
@@ -248,12 +252,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_base_0
 msgid "033 - base 0%"
-msgstr ""
+msgstr "033 - Besteuerungsgrundlage 0%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_breakdown_taxable_turnover_base
 msgid "037 - Breakdown of taxable turnover – base"
-msgstr ""
+msgstr "037 - Steuerpflichtiger Umsatz: Aufteilung - Besteuerungsgrundlage"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_tax_3
@@ -263,12 +267,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_tax_3
 msgid "040 - tax 3%"
-msgstr ""
+msgstr "040 - MwSt. 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_breakdown_taxable_turnover_tax
 msgid "046 - Breakdown of taxable turnover – tax"
-msgstr ""
+msgstr "046 - Steuerpflichtiger Umsatz: Aufteilung - MwSt."
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_base_3
@@ -278,12 +282,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_base_3
 msgid "049 - base 3%"
-msgstr ""
+msgstr "049 - Besteuerungsgrundlage 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_intra_community_acqui_of_goods_base
 msgid "051 - Intra-Community acquisitions of goods – base"
-msgstr ""
+msgstr "051 - Innergemeinschaftliche Erwerbe von Gegenständen - Besteuerungsgrundlage"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_tax_3
@@ -293,12 +297,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_tax_3
 msgid "054 - tax 3%"
-msgstr ""
+msgstr "054 - MwSt. 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_intra_community_acquisitions_goods_tax
 msgid "056 - Intra-Community acquisitions of goods – tax"
-msgstr ""
+msgstr "056 - Innergemeinschaftliche Erwerbe von Gegenständen - MwSt."
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_base_3
@@ -308,7 +312,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_3
 msgid "059 - for business purposes: base 3%"
-msgstr ""
+msgstr "059 - für Zwecke des Unternehmens: Besteuerungsgrundlage 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_base_3
@@ -318,12 +322,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_3
 msgid "063 - for non-business purposes: base 3%"
-msgstr ""
+msgstr "063 - für unternehmensfremde Zwecke: Besteuerungsgrundlage 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_importation_of_goods_base
 msgid "065 - Importation of goods – base"
-msgstr ""
+msgstr "065 - Einfuhren von Gegenständen - Besteuerungsgrundlage"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_tax_3
@@ -333,7 +337,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_3
 msgid "068 - for business purposes: tax 3%"
-msgstr ""
+msgstr "068 - für Zwecke des Unternehmens: MwSt. 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_tax_3
@@ -343,12 +347,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_3
 msgid "073 - for non-business purposes: tax 3%"
-msgstr ""
+msgstr "073 - für unternehmensfremde Zwecke: MwSt. 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2h_total_tax_due
 msgid "076 - Total tax due"
-msgstr ""
+msgstr "076 - Gesamtbetrag der Steuer"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_4_due_respect_application_goods
@@ -359,6 +363,8 @@ msgstr ""
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_4_due_respect_application_goods
 msgid "090 - Due in respect of the application of goods for business purposes"
 msgstr ""
+"090 - Erklärte Mehrwertsteuer für die Zuordnung von Gegenständen zu Zwecken "
+"des Unternehmens"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_6_paid_joint_several_guarantee
@@ -368,12 +374,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_6_paid_joint_several_guarantee
 msgid "092 - Paid as joint and several guarantee"
-msgstr ""
+msgstr "092 - Als solidarisch haftender Bürge bezahlte MwSt."
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_total_input_tax
 msgid "093 - Total input tax"
-msgstr ""
+msgstr "093 - Gesamtbetrag Vorsteuer"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3b1_rel_trans
@@ -381,6 +387,8 @@ msgid ""
 "094 - relating to transactions which are exempt pursuant to articles 44 and "
 "56quater"
 msgstr ""
+"094 - Nicht abziehbare Vorsteuer betreffend die gemäß Art. 44 und Art. 56quater "
+"steuerfreien Umsätze"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3b2_ded_prop
@@ -388,31 +396,45 @@ msgid ""
 "095 - where the deductible proportion determined in accordance to article 50 "
 "is applied"
 msgstr ""
+"095 - Nicht abziehbare Vorsteuer in Anwendung der in Art. 50 vorgesehenen "
+"Prorata-Regel"
+
+#. module: l10n_lu
+#: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3b2_input_tax_margin
+msgid "096"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3b2_input_tax_margin
+msgid ""
+"096 - Non recoverable input tax in accordance with Art. 56ter-1(7) and "
+"56ter-2(7) (when applying the margin scheme)"
+msgstr "096 - Nicht abziehbare Vorsteuer in Anwendung von Art. 56ter-1/7 und 56ter-2/7 "
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3b_total_input_tax_nd
 msgid "097 - Total input tax non-deductible"
-msgstr ""
+msgstr "097 - Gesamtbetrag der nicht abziehbaren Vorsteuer"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3c_total_input_tax_deductible
 msgid "102 - Total input tax deductible"
-msgstr ""
+msgstr "102 - Gesamtbetrag der abziehbaren Vorsteuer"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_4a_total_tax_due
 msgid "103 - Total tax due"
-msgstr ""
+msgstr "103 - Gesamtbetrag der Steuer"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_4a_total_input_tax_deductible
 msgid "104 - Total input tax deductible"
-msgstr ""
+msgstr "104 - Gesamtbetrag der abziehbaren Vorsteuer"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_4c_exceeding_amount
 msgid "105 - Exceeding amount"
-msgstr ""
+msgstr "105 - Überschuss"
 
 #. module: l10n_lu
 #: model:account.tax.template,description:l10n_lu.lu_2015_tax_AB-EC-14
@@ -564,7 +586,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2c_acquisitions_triangular_transactions_base
 msgid "152 - Acquisitions, in the context of triangular transactions – base"
-msgstr ""
+msgstr "152 - Im Rahmen von Dreiecksgeschäften getätigte Erwerbe - Besteuerungsgrundlage"
 
 #. module: l10n_lu
 #: model:account.tax.template,description:l10n_lu.lu_2015_tax_AB-EC-17
@@ -716,7 +738,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_base_exempt
 msgid "194 - base exempt"
-msgstr ""
+msgstr "194 - Besteuerungsgrundlage steuerbefreit"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_base_exempt
@@ -726,7 +748,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_exempt
 msgid "195 - for business purposes: base exempt"
-msgstr ""
+msgstr "195 - für Zwecke des Unternehmens: Besteuerungsgrundlage steuerbefreit"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_base_exempt
@@ -736,7 +758,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_exempt
 msgid "196 - for non-business purposes: base exempt"
-msgstr ""
+msgstr "196 - für unternehmensfremde Zwecke: Besteuerungsgrundlage steuerbefreit"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_6_c_supplies_scope_special_arrangement
@@ -748,7 +770,7 @@ msgstr ""
 msgid ""
 "226 - Supplies carried out within the scope of the special arrangement of "
 "art. 56sexies"
-msgstr ""
+msgstr "226 - Im Rahmen der Sonderregelung von Artikel 56sexies getätigte Umsätze"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2g_special_arrangement
@@ -758,7 +780,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2g_special_arrangement
 msgid "227 - Special arrangement for tax suspension: adjustment"
-msgstr ""
+msgstr "227 - Sonderregelung zur Steueraussetzung: Berichtigung"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_7_adjusted_tax_special_arrangement
@@ -768,7 +790,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_7_adjusted_tax_special_arrangement
 msgid "228 - Adjusted tax - special arrangement for tax suspension"
-msgstr ""
+msgstr "228 - Berichtigte Steuer - Sonderregelung zur Steueraussetzung"
 
 #. module: l10n_lu
 #: model:account.tax.template,name:l10n_lu.lu_2011_tax_FB-PA-3
@@ -888,7 +910,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_importation_of_goods_tax
 msgid "407 - Importation of goods – tax"
-msgstr ""
+msgstr "407 - Einfuhren von Gegenständen - MwSt."
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_supply_of_service_for_customer
@@ -896,6 +918,8 @@ msgid ""
 "409 - Supply of services for which the customer is liable for the payment of "
 "VAT – base"
 msgstr ""
+"409 - Vom Empfänger als Steuerschuldner zu erklärende Dienstleistungen "
+" - Besteuerungsgrundlage"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_supply_of_service_for_customer_liable_for_payment_tax
@@ -903,6 +927,8 @@ msgid ""
 "410 - Supply of services for which the customer is liable for the payment of "
 "VAT – tax"
 msgstr ""
+"410 - Vom Empfänger als Steuerschuldner zu erklärende Dienstleistungen "
+" - MwSt."
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_7_inland_supplies_for_customer
@@ -914,6 +940,7 @@ msgstr ""
 msgid ""
 "419 - Inland supplies for which the customer is liable for the payment of VAT"
 msgstr ""
+"419 - Umsätze im Inland, für die der Empfänger Steuerschuldner ist"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_6_b1_non_exempt_customer_vat
@@ -925,6 +952,8 @@ msgstr ""
 msgid ""
 "423 - not exempt in the MS where the customer is liable for payment of VAT"
 msgstr ""
+"423 - Dienstleistungen, die im Mitgliedstaat des Empfängers, der dort für "
+"Zwecke der MwSt. erfasst und Steuerschuldner ist, nicht steuerbefreit sind"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_6_b2_exempt_ms_customer
@@ -935,6 +964,8 @@ msgstr ""
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1b_6_b2_exempt_ms_customer
 msgid "424 - exempt in the MS where the customer is identified"
 msgstr ""
+"424 - Dienstleistungen, die im Mitgliedstaat des Empfängers, "
+"der dort für Zwecke der MwSt. erfasst ist, steuerbefreit sind"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_base_3
@@ -944,7 +975,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_3
 msgid "431 - not exempt within the territory: base 3%"
-msgstr ""
+msgstr "431 - nicht steuerbefreit im Inland: Besteuerungsgrundlage 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_tax_3
@@ -954,7 +985,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_3
 msgid "432 - not exempt within the territory: tax 3%"
-msgstr ""
+msgstr "432 - nicht steuerbefreit im Inland: MwSt. 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_b_exempt
@@ -964,12 +995,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_b_exempt
 msgid "435 - exempt within the territory: exempt"
-msgstr ""
+msgstr "435 - steuerbefreit im Inland: steuerbefreit"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_base
 msgid "436 - base"
-msgstr ""
+msgstr "436 - Besteuerungsgrundlage"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_base_3
@@ -980,6 +1011,8 @@ msgstr ""
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_3
 msgid "441 - not established or residing within the Community: base 3%"
 msgstr ""
+"441 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht "
+"in der Gemeinschaft ansässig sind: Besteuerungsgrundlage 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_tax_3
@@ -990,6 +1023,8 @@ msgstr ""
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_3
 msgid "442 - not established or residing within the Community: tax 3%"
 msgstr ""
+"442 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht "
+"in der Gemeinschaft ansässig sind: MwSt. 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_exempt
@@ -1000,11 +1035,13 @@ msgstr ""
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_exempt
 msgid "445 - not established or residing within the Community: exempt"
 msgstr ""
+"445 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht "
+"in der Gemeinschaft ansässig sind: steuerbefreit"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1a_total_sale
 msgid "454 - Total Sales / Receipts"
-msgstr ""
+msgstr "454 - Gesamtbetrag der Entgelte"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1a_app_goods_non_bus
@@ -1016,6 +1053,8 @@ msgstr ""
 msgid ""
 "455 - Application of goods for non-business use and for business purposes"
 msgstr ""
+"455 - Entnahmen von Gegenständen für Zwecke des Unternehmens und für "
+"unternehmensfremde Zwecke"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1a_non_bus_gs
@@ -1025,7 +1064,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1a_non_bus_gs
 msgid "456 - Non-business use of goods and supply of services free of charge"
-msgstr ""
+msgstr "456 - Erbringung von Dienstleistungen für unternehmensfremde Zwecke"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_1_intra_community_goods_pi_vat
@@ -1038,6 +1077,8 @@ msgid ""
 "457 - Intra-Community supply of goods to persons identified for VAT purposes "
 "in another Member State (MS)"
 msgstr ""
+"457 - Innergemeinschaftliche Lieferungen an Personen, die eine Id.-Nummer in "
+"einem anderen Mitgliedstaat besitzen"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_1_invoiced_by_other_taxable_person
@@ -1047,7 +1088,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_1_invoiced_by_other_taxable_person
 msgid "458 - Invoiced by other taxable persons for goods or services supplied"
-msgstr ""
+msgstr "458 - Von anderen Steuerpflichtigen für Warenlieferungen und "
+"Dienstleistungen in Rechnung gestellte Mehrwertsteuer"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_2_due_respect_intra_comm_goods
@@ -1058,6 +1100,8 @@ msgstr ""
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_2_due_respect_intra_comm_goods
 msgid "459 - Due in respect of intra-Community acquisitions of goods"
 msgstr ""
+"459 - Erklärte oder bezahlte Mehrwertsteuer für innergemeinschaftliche "
+"Erwerbe von Gegenständen"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_3_due_paid_respect_importation_goods
@@ -1067,7 +1111,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_3_due_paid_respect_importation_goods
 msgid "460 - Due or paid in respect of importation of goods"
-msgstr ""
+msgstr "460 - Erklärte oder bezahlte Mehrwertsteuer für eingeführte Waren"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_5_due_under_reverse_charge
@@ -1077,22 +1121,22 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_5_due_under_reverse_charge
 msgid "461 - Due under the reverse charge (see points II.E and F)"
-msgstr ""
+msgstr "461 - Als Schuldner erklärte Mehrwertsteuer (Siehe Punkte II.E und F)"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax
 msgid "462 - tax"
-msgstr ""
+msgstr "462 - MwSt."
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_base
 msgid "463 - base"
-msgstr ""
+msgstr "463 - Besteuerungsgrundlage"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax
 msgid "464 - tax"
-msgstr ""
+msgstr "464 - MwSt."
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1a_telecom_service
@@ -1104,12 +1148,12 @@ msgstr ""
 msgid ""
 "471 - Telecommunications services, radio and television broadcasting "
 "services..."
-msgstr ""
+msgstr "471 - Telekommunikationsdienstleistungen, Rundfunk- und Fernsehdienstleistungen..."
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1a_other_sales
 msgid "472 - Other sales / receipts"
-msgstr ""
+msgstr "472 - Andere Umsätze / Erträge"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_base_17
@@ -1119,7 +1163,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_base_17
 msgid "701 - base 17%"
-msgstr ""
+msgstr "701 - Besteuerungsgrundlage 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_tax_17
@@ -1129,7 +1173,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_tax_17
 msgid "702 - tax 17%"
-msgstr ""
+msgstr "702 - MwSt. 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_base_14
@@ -1139,7 +1183,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_base_14
 msgid "703 - base 14%"
-msgstr ""
+msgstr "703 - Besteuerungsgrundlage 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_tax_14
@@ -1149,7 +1193,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_tax_14
 msgid "704 - tax 14%"
-msgstr ""
+msgstr "704 - MwSt. 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_base_8
@@ -1159,7 +1203,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_base_8
 msgid "705 - base 8%"
-msgstr ""
+msgstr "705 - Besteuerungsgrundlage 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_tax_8
@@ -1169,7 +1213,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_tax_8
 msgid "706 - tax 8%"
-msgstr ""
+msgstr "706 - MwSt. 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_base_17
@@ -1179,7 +1223,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_base_17
 msgid "711 - base 17%"
-msgstr ""
+msgstr "711 - Besteuerungsgrundlage 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_tax_17
@@ -1189,7 +1233,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_tax_17
 msgid "712 - tax 17%"
-msgstr ""
+msgstr "712 - MwSt. 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_base_14
@@ -1199,7 +1243,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_base_14
 msgid "713 - base 14%"
-msgstr ""
+msgstr "713 - Besteuerungsgrundlage 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_tax_14
@@ -1209,7 +1253,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_tax_14
 msgid "714 - tax 14%"
-msgstr ""
+msgstr "714 - MwSt. 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_base_8
@@ -1219,7 +1263,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_base_8
 msgid "715 - base 8%"
-msgstr ""
+msgstr "715 - Besteuerungsgrundlage 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_tax_8
@@ -1229,8 +1273,22 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_tax_8
 msgid "716 - tax 8%"
+msgstr "716 - MwSt. 8%"
+
+#. module: l10n_lu
+#: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_manufactured_tobacco
+msgid "719"
 msgstr ""
 
+#. module: l10n_lu
+#: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_manufactured_tobacco
+msgid ""
+"719 - of manufactured tobacco (VAT is collected at the exit of the tax "
+"warehouse with excise duties)"
+msgstr ""
+"719 - von Tabakwaren, deren Mehrwertsteuer am Ausgang des Steuerlagers "
+"gemeinsam mit den Verbrauchsteuern erhoben wird"
+
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_base_17
 msgid "721"
@@ -1239,7 +1297,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_17
 msgid "721 - for business purposes: base 17%"
-msgstr ""
+msgstr "721 - für Zwecke des Unternehmens: Besteuerungsgrundlage 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_tax_17
@@ -1249,7 +1307,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_17
 msgid "722 - for business purposes: tax 17%"
-msgstr ""
+msgstr "722 - für Zwecke des Unternehmens: MwSt. 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_base_14
@@ -1259,7 +1317,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_14
 msgid "723 - for business purposes: base 14%"
-msgstr ""
+msgstr "723 - für Zwecke des Unternehmens: Besteuerungsgrundlage 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_tax_14
@@ -1269,7 +1327,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_14
 msgid "724 - for business purposes: tax 14%"
-msgstr ""
+msgstr "724 - für Zwecke des Unternehmens: MwSt. 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_base_8
@@ -1279,7 +1337,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_8
 msgid "725 - for business purposes: base 8%"
-msgstr ""
+msgstr "725 - für Zwecke des Unternehmens: Besteuerungsgrundlage 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_tax_8
@@ -1289,8 +1347,22 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_8
 msgid "726 - for business purposes: tax 8%"
+msgstr "726 - für Zwecke des Unternehmens: MwSt. 8%"
+
+#. module: l10n_lu
+#: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_manufactured_tobacco
+msgid "729"
 msgstr ""
 
+#. module: l10n_lu
+#: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_manufactured_tobacco
+msgid ""
+"729 - of manufactured tobacco (VAT is collected at the exit of the tax "
+"warehouse with excise duties)"
+msgstr ""
+"729 - von Tabakwaren, deren Mehrwertsteuer am Ausgang des Steuerlagers "
+"gemeinsam mit den Verbrauchsteuern erhoben wird"
+
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_base_17
 msgid "731"
@@ -1299,7 +1371,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_17
 msgid "731 - for non-business purposes: base 17%"
-msgstr ""
+msgstr "731 - für unternehmensfremde Zwecke: Besteuerungsgrundlage 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_tax_17
@@ -1309,7 +1381,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_17
 msgid "732 - for non-business purposes: tax 17%"
-msgstr ""
+msgstr "732 - für unternehmensfremde Zwecke: MwSt. 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_base_14
@@ -1319,7 +1391,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_14
 msgid "733 - for non-business purposes: base 14%"
-msgstr ""
+msgstr "733 - für unternehmensfremde Zwecke: Besteuerungsgrundlage 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_tax_14
@@ -1329,7 +1401,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_14
 msgid "734 - for non-business purposes: tax 14%"
-msgstr ""
+msgstr "734 - für unternehmensfremde Zwecke: MwSt. 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_base_8
@@ -1339,7 +1411,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_8
 msgid "735 - for non-business purposes: base 8%"
-msgstr ""
+msgstr "735 - für unternehmensfremde Zwecke: Besteuerungsgrundlage 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_tax_8
@@ -1349,7 +1421,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_8
 msgid "736 - for non-business purposes: tax 8%"
-msgstr ""
+msgstr "736 - für unternehmensfremde Zwecke: MwSt. 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_base_17
@@ -1359,7 +1431,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_17
 msgid "741 - not exempt within the territory: base 17%"
-msgstr ""
+msgstr "741 - nicht steuerbefreit im Inland: Besteuerungsgrundlage 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_tax_17
@@ -1369,7 +1441,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_17
 msgid "742 - not exempt within the territory: tax 17%"
-msgstr ""
+msgstr "742 - nicht steuerbefreit im Inland: MwSt. 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_base_14
@@ -1379,7 +1451,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_14
 msgid "743 - not exempt within the territory: base 14%"
-msgstr ""
+msgstr "743 - nicht steuerbefreit im Inland: Besteuerungsgrundlage 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_tax_14
@@ -1389,7 +1461,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_14
 msgid "744 - not exempt within the territory: tax 14%"
-msgstr ""
+msgstr "744 - nicht steuerbefreit im Inland: MwSt. 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_base_8
@@ -1399,7 +1471,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_8
 msgid "745 - not exempt within the territory: base 8%"
-msgstr ""
+msgstr "745 - nicht steuerbefreit im Inland: Besteuerungsgrundlage 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_tax_8
@@ -1409,7 +1481,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_8
 msgid "746 - not exempt within the territory: tax 8%"
-msgstr ""
+msgstr "746 - nicht steuerbefreit im Inland: MwSt. 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_base_17
@@ -1420,6 +1492,8 @@ msgstr ""
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_17
 msgid "751 - not established or residing within the Community: base 17%"
 msgstr ""
+"751 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht "
+"in der Gemeinschaft ansässig sind: Besteuerungsgrundlage 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_tax_17
@@ -1430,6 +1504,8 @@ msgstr ""
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_17
 msgid "752 - not established or residing within the Community: tax 17%"
 msgstr ""
+"752 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht "
+"in der Gemeinschaft ansässig sind: MwSt. 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_base_14
@@ -1440,6 +1516,8 @@ msgstr ""
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_14
 msgid "753 - not established or residing within the Community: base 14%"
 msgstr ""
+"753 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht "
+"in der Gemeinschaft ansässig sind: Besteuerungsgrundlage 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_tax_14
@@ -1450,6 +1528,8 @@ msgstr ""
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_14
 msgid "754 - not established or residing within the Community: tax 14%"
 msgstr ""
+"754 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht "
+"in der Gemeinschaft ansässig sind: MwSt. 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_base_8
@@ -1460,6 +1540,8 @@ msgstr ""
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_8
 msgid "755 - not established or residing within the Community: base 8%"
 msgstr ""
+"755 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht "
+"in der Gemeinschaft ansässig sind: Besteuerungsgrundlage 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_tax_8
@@ -1469,7 +1551,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_8
 msgid "756 - not established or residing within the Community: tax 8%"
-msgstr ""
+msgstr "756 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht "
+"in der Gemeinschaft ansässig sind: MwSt. 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_3_base_17
@@ -1480,6 +1563,8 @@ msgstr ""
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_3_base_17
 msgid "761 - suppliers established within the territory: base 17%"
 msgstr ""
+"761 - erbracht an den Erklärenden von im Inland ansässigen Steuerpflichtigen: "
+"Besteuerungsgrundlage 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_3_tax_17
@@ -1489,7 +1574,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax_17
 msgid "762 - suppliers established within the territory: tax 17%"
-msgstr ""
+msgstr "762 - erbracht an den Erklärenden von im Inland ansässigen "
+"Steuerpflichtigen: MwSt. 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2f_supply_goods_base_8
@@ -1499,7 +1585,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_8
 msgid "763 - base 8%"
-msgstr ""
+msgstr "763 - Besteuerungsgrundlage 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_8
@@ -1509,17 +1595,17 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_8
 msgid "764 - tax 8%"
-msgstr ""
+msgstr "764 - MwSt. 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_3_base
 msgid "765 - base"
-msgstr ""
+msgstr "765 - Besteuerungsgrundlage"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax
 msgid "766 - tax"
-msgstr ""
+msgstr "766 - MwSt."
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base
@@ -1527,6 +1613,7 @@ msgid ""
 "767 - Supply of goods for which the purchaser is liable for the payment of "
 "VAT - base"
 msgstr ""
+"767 -Vom Erwerber als Steuerschuldner zu erklärende Lieferungen - Besteuerungsgrundlage"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax
@@ -1534,6 +1621,7 @@ msgid ""
 "768 - Supply of goods for which the purchaser is liable for the payment of "
 "VAT - tax"
 msgstr ""
+"768 -Vom Erwerber als Steuerschuldner zu erklärende Lieferungen - MwSt."
 
 #. module: l10n_lu
 #: model:account.tax.template,name:l10n_lu.lu_2015_tax_FB-PA-8

addons/l10n_lu/i18n_extra/fr.po

@@ -154,7 +154,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1a_overall_turnover
 msgid "012 - Overall turnover"
-msgstr ""
+msgstr "012 - Chiffre d'affaires global"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_2_export
@@ -164,7 +164,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1b_2_export
 msgid "014 - Exports"
-msgstr ""
+msgstr "014 - Exportations"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_3_other_exemptions_art_43
@@ -174,7 +174,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1b_3_other_exemptions_art_43
 msgid "015 - Other exemptions"
-msgstr ""
+msgstr "015 - Autres exonérations"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_4_other_exemptions_art_44_et_56quater
@@ -184,7 +184,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1b_4_other_exemptions_art_44_et_56quater
 msgid "016 - Other exemptions"
-msgstr ""
+msgstr "016 - Autres exonérations"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_5_manufactured_tobacco_vat_collected
@@ -197,6 +197,8 @@ msgid ""
 "017 - Manufactured tobacco whose VAT was collected at the source or at the "
 "exit of the tax..."
 msgstr ""
+"017 - Tabacs fabriqués dont la TVA a été perçue à la source respectivement "
+"à la sortie de l'entrepôt fiscal..."
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_6_a_subsequent_to_intra_community
@@ -209,6 +211,8 @@ msgid ""
 "018 - Supply, subsequent to intra-Community acquisitions of goods, in the "
 "context of triangular transactions, when the customer identified,..."
 msgstr ""
+"018 - Livraisons subséquentes à des acqu. Intra. dans le cadre d'opérations "
+"triangulaires…"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_6_d_supplies_other_referred
@@ -218,17 +222,17 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1b_6_d_supplies_other_referred
 msgid "019 - Supplies other than referred to in 018 and 423 or 424"
-msgstr ""
+msgstr "019 - Autres opérations réalisées (imposables) à l'étranger"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1b_exemptions_deductible_amounts
 msgid "021 - Exemptions and deductible amounts"
-msgstr ""
+msgstr "021 - Exonérations et montants déductibles"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1c_taxable_turnover
 msgid "022 - Taxable turnover"
-msgstr ""
+msgstr "022 - Chiffre d'affaires imposable"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_base_3
@@ -238,7 +242,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_base_3
 msgid "031 - base 3%"
-msgstr ""
+msgstr "031 - base 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_base_0
@@ -248,12 +252,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_base_0
 msgid "033 - base 0%"
-msgstr ""
+msgstr "033 - base 0%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_breakdown_taxable_turnover_base
 msgid "037 - Breakdown of taxable turnover – base"
-msgstr ""
+msgstr "037 - Chiffre d'affaires imposable – base"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_tax_3
@@ -263,12 +267,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_tax_3
 msgid "040 - tax 3%"
-msgstr ""
+msgstr "040 - taxe 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_breakdown_taxable_turnover_tax
 msgid "046 - Breakdown of taxable turnover – tax"
-msgstr ""
+msgstr "046 - Chiffre d'affaires imposable – taxe"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_base_3
@@ -278,12 +282,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_base_3
 msgid "049 - base 3%"
-msgstr ""
+msgstr "049 - base 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_intra_community_acqui_of_goods_base
 msgid "051 - Intra-Community acquisitions of goods – base"
-msgstr ""
+msgstr "051 - Acquisitions intracommunautaires de biens - base"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_tax_3
@@ -293,12 +297,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_tax_3
 msgid "054 - tax 3%"
-msgstr ""
+msgstr "054 - taxe 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_intra_community_acquisitions_goods_tax
 msgid "056 - Intra-Community acquisitions of goods – tax"
-msgstr ""
+msgstr "056 - Acquisitions intracommunautaires de biens - taxe"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_base_3
@@ -308,7 +312,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_3
 msgid "059 - for business purposes: base 3%"
-msgstr ""
+msgstr "059 - à des fins de l'entreprise: base 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_base_3
@@ -318,12 +322,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_3
 msgid "063 - for non-business purposes: base 3%"
-msgstr ""
+msgstr "063 - à des fins étrangères à l'entreprise: base 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_importation_of_goods_base
 msgid "065 - Importation of goods – base"
-msgstr ""
+msgstr "065 - Importations de biens - base"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_tax_3
@@ -333,7 +337,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_3
 msgid "068 - for business purposes: tax 3%"
-msgstr ""
+msgstr "068 - à des fins de l'entreprise: taxe de 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_tax_3
@@ -343,12 +347,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_3
 msgid "073 - for non-business purposes: tax 3%"
-msgstr ""
+msgstr "073 - à des fins étrangères à l'entreprise: taxe de 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2h_total_tax_due
 msgid "076 - Total tax due"
-msgstr ""
+msgstr "076 - Total de la taxe en aval"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_4_due_respect_application_goods
@@ -358,7 +362,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_4_due_respect_application_goods
 msgid "090 - Due in respect of the application of goods for business purposes"
-msgstr ""
+msgstr "090 - Taxe déclarée pour l'affectation de biens à l'entreprise"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_6_paid_joint_several_guarantee
@@ -368,12 +372,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_6_paid_joint_several_guarantee
 msgid "092 - Paid as joint and several guarantee"
-msgstr ""
+msgstr "092 - Taxe acquittée comme caution solidaire"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_total_input_tax
 msgid "093 - Total input tax"
-msgstr ""
+msgstr "093 - Total de la taxe en amont"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3b1_rel_trans
@@ -381,6 +385,8 @@ msgid ""
 "094 - relating to transactions which are exempt pursuant to articles 44 and "
 "56quater"
 msgstr ""
+"094 - Taxe non déductible en rapport avec des opérations exonérées en vertu "
+"des articles 44 et 56quater"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3b2_ded_prop
@@ -388,31 +394,47 @@ msgid ""
 "095 - where the deductible proportion determined in accordance to article 50 "
 "is applied"
 msgstr ""
+"095 - Taxe non déductible en application du prorata visé à l'article 50"
+
+#. module: l10n_lu
+#: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3b2_input_tax_margin
+msgid "096"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3b2_input_tax_margin
+msgid ""
+"096 - Non recoverable input tax in accordance with Art. 56ter-1(7) and "
+"56ter-2(7) (when applying the margin scheme)"
+msgstr ""
+"096 - Taxe non déductible en application des articles 56ter-1/7 et "
+"56ter-2/7 (en cas d'option pour le régime d'imposition de la marge "
+"bénéficiaire)"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3b_total_input_tax_nd
 msgid "097 - Total input tax non-deductible"
-msgstr ""
+msgstr "097 - Total de la taxe en amont non déductible"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3c_total_input_tax_deductible
 msgid "102 - Total input tax deductible"
-msgstr ""
+msgstr "102 - Total de la taxe en amont déductible"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_4a_total_tax_due
 msgid "103 - Total tax due"
-msgstr ""
+msgstr "103 - Total de la taxe en aval"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_4a_total_input_tax_deductible
 msgid "104 - Total input tax deductible"
-msgstr ""
+msgstr "104 - Total de la taxe en amont déductible"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_4c_exceeding_amount
 msgid "105 - Exceeding amount"
-msgstr ""
+msgstr "105 - Excédent"
 
 #. module: l10n_lu
 #: model:account.tax.template,description:l10n_lu.lu_2015_tax_AB-EC-14
@@ -564,7 +586,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2c_acquisitions_triangular_transactions_base
 msgid "152 - Acquisitions, in the context of triangular transactions – base"
-msgstr ""
+msgstr "152 - Acquisitions triangulaires – base"
 
 #. module: l10n_lu
 #: model:account.tax.template,description:l10n_lu.lu_2015_tax_AB-EC-17
@@ -716,7 +738,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_base_exempt
 msgid "194 - base exempt"
-msgstr ""
+msgstr "194 - base exonérée"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_base_exempt
@@ -726,7 +748,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_exempt
 msgid "195 - for business purposes: base exempt"
-msgstr ""
+msgstr "195 - à des fins de l'entreprise: base exonérée"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_base_exempt
@@ -736,7 +758,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_exempt
 msgid "196 - for non-business purposes: base exempt"
-msgstr ""
+msgstr "196 - à des fins étrangères à l'entreprise: base exonérée"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_6_c_supplies_scope_special_arrangement
@@ -749,6 +771,8 @@ msgid ""
 "226 - Supplies carried out within the scope of the special arrangement of "
 "art. 56sexies"
 msgstr ""
+"226 - Opérations réalisées dans le cadre du régime particulier de l'article "
+"56sexies"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2g_special_arrangement
@@ -758,7 +782,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2g_special_arrangement
 msgid "227 - Special arrangement for tax suspension: adjustment"
-msgstr ""
+msgstr "227 - Régime particulier suspensif: régularisation"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_7_adjusted_tax_special_arrangement
@@ -768,7 +792,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_7_adjusted_tax_special_arrangement
 msgid "228 - Adjusted tax - special arrangement for tax suspension"
-msgstr ""
+msgstr "228 - Taxe régularisée - régime particulier suspensif"
 
 #. module: l10n_lu
 #: model:account.tax.template,name:l10n_lu.lu_2011_tax_FB-PA-3
@@ -888,7 +912,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_importation_of_goods_tax
 msgid "407 - Importation of goods – tax"
-msgstr ""
+msgstr "407 - Importations de biens - taxe"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_supply_of_service_for_customer
@@ -896,6 +920,8 @@ msgid ""
 "409 - Supply of services for which the customer is liable for the payment of "
 "VAT – base"
 msgstr ""
+"409 - Prestations de services à déclarer par le preneur redevable de la taxe "
+"- base"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_supply_of_service_for_customer_liable_for_payment_tax
@@ -903,6 +929,8 @@ msgid ""
 "410 - Supply of services for which the customer is liable for the payment of "
 "VAT – tax"
 msgstr ""
+"410 - Prestations de services à déclarer par le preneur redevable de la taxe "
+"- taxe"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_7_inland_supplies_for_customer
@@ -914,6 +942,7 @@ msgstr ""
 msgid ""
 "419 - Inland supplies for which the customer is liable for the payment of VAT"
 msgstr ""
+"419 - Opérations à l'intérieur du pays pour lesquelles le preneur est le redevable"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_6_b1_non_exempt_customer_vat
@@ -925,6 +954,7 @@ msgstr ""
 msgid ""
 "423 - not exempt in the MS where the customer is liable for payment of VAT"
 msgstr ""
+"423 - Prestations de services non exonérées dans l'Etat membre du preneur redevable"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_6_b2_exempt_ms_customer
@@ -934,7 +964,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1b_6_b2_exempt_ms_customer
 msgid "424 - exempt in the MS where the customer is identified"
-msgstr ""
+msgstr "424 - Prestations de services exonérées dans l'Etat membre du preneur"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_base_3
@@ -944,7 +974,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_3
 msgid "431 - not exempt within the territory: base 3%"
-msgstr ""
+msgstr "431 - non exonérées à l'intérieur du pays: base 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_tax_3
@@ -954,7 +984,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_3
 msgid "432 - not exempt within the territory: tax 3%"
-msgstr ""
+msgstr "432 - non exonérées à l'intérieur du pays: tax 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_b_exempt
@@ -964,7 +994,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_b_exempt
 msgid "435 - exempt within the territory: exempt"
-msgstr ""
+msgstr "435 - exonérées à l'intérieur du pays: exonérées"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_base
@@ -979,7 +1009,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_3
 msgid "441 - not established or residing within the Community: base 3%"
-msgstr ""
+msgstr "441 - effectuées au déclarant par des assujettis établis en dehors "
+"de la Communauté: base 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_tax_3
@@ -989,7 +1020,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_3
 msgid "442 - not established or residing within the Community: tax 3%"
-msgstr ""
+msgstr "442 - effectuées au déclarant par des assujettis établis en dehors "
+"de la Communauté: tax 3%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_exempt
@@ -999,12 +1031,13 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_exempt
 msgid "445 - not established or residing within the Community: exempt"
-msgstr ""
+msgstr "445 - effectuées au déclarant par des assujettis établis en dehors "
+"de la Communauté: exonérées"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1a_total_sale
 msgid "454 - Total Sales / Receipts"
-msgstr ""
+msgstr "454 - Total Ventes / Recettes"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1a_app_goods_non_bus
@@ -1016,6 +1049,7 @@ msgstr ""
 msgid ""
 "455 - Application of goods for non-business use and for business purposes"
 msgstr ""
+"455 - Application de biens de l'utilisation privée et à des fins de l'entreprise"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1a_non_bus_gs
@@ -1025,7 +1059,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1a_non_bus_gs
 msgid "456 - Non-business use of goods and supply of services free of charge"
-msgstr ""
+msgstr "456 - Prestations de services effectuées à des fins étrangères à "
+"l'entreprise"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1b_1_intra_community_goods_pi_vat
@@ -1038,6 +1073,8 @@ msgid ""
 "457 - Intra-Community supply of goods to persons identified for VAT purposes "
 "in another Member State (MS)"
 msgstr ""
+"457 - Livraisons intracommunautaires de biens à des personnes identifiées à "
+"la TVA dans un autre État membre"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_1_invoiced_by_other_taxable_person
@@ -1047,7 +1084,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_1_invoiced_by_other_taxable_person
 msgid "458 - Invoiced by other taxable persons for goods or services supplied"
-msgstr ""
+msgstr "458 - Taxe facturée par d'autres assujettis pour des biens et des services fournis"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_2_due_respect_intra_comm_goods
@@ -1057,7 +1094,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_2_due_respect_intra_comm_goods
 msgid "459 - Due in respect of intra-Community acquisitions of goods"
-msgstr ""
+msgstr "459 - Taxe déclarée ou payée sur des acquisitions intracommunautaires de biens"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_3_due_paid_respect_importation_goods
@@ -1067,7 +1104,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_3_due_paid_respect_importation_goods
 msgid "460 - Due or paid in respect of importation of goods"
-msgstr ""
+msgstr "460 - Taxe déclarée ou payée sur des biens importés"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3a_5_due_under_reverse_charge
@@ -1077,12 +1114,12 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3a_5_due_under_reverse_charge
 msgid "461 - Due under the reverse charge (see points II.E and F)"
-msgstr ""
+msgstr "461 - Taxe déclarée comme débiteur (cf points II.E et F)"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax
 msgid "462 - tax"
-msgstr ""
+msgstr "462 - taxe"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_base
@@ -1092,7 +1129,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax
 msgid "464 - tax"
-msgstr ""
+msgstr "464 - taxe"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_1a_telecom_service
@@ -1105,11 +1142,12 @@ msgid ""
 "471 - Telecommunications services, radio and television broadcasting "
 "services..."
 msgstr ""
+"471 - Prestations de services de télécom., de radio et de tv..."
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_1a_other_sales
 msgid "472 - Other sales / receipts"
-msgstr ""
+msgstr "472 - Autres Ventes / Recettes"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_base_17
@@ -1129,7 +1167,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_tax_17
 msgid "702 - tax 17%"
-msgstr ""
+msgstr "702 - taxe 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_base_14
@@ -1149,7 +1187,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_tax_14
 msgid "704 - tax 14%"
-msgstr ""
+msgstr "704 - taxe 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2a_base_8
@@ -1169,7 +1207,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2a_tax_8
 msgid "706 - tax 8%"
-msgstr ""
+msgstr "706 - taxe 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_base_17
@@ -1189,7 +1227,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_tax_17
 msgid "712 - tax 17%"
-msgstr ""
+msgstr "712 - taxe 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_base_14
@@ -1209,7 +1247,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_tax_14
 msgid "714 - tax 14%"
-msgstr ""
+msgstr "714 - taxe 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_base_8
@@ -1229,8 +1267,22 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_tax_8
 msgid "716 - tax 8%"
+msgstr "716 - taxe 8%"
+
+#. module: l10n_lu
+#: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_manufactured_tobacco
+msgid "719"
 msgstr ""
 
+#. module: l10n_lu
+#: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_manufactured_tobacco
+msgid ""
+"719 - of manufactured tobacco (VAT is collected at the exit of the tax "
+"warehouse with excise duties)"
+msgstr ""
+"719 - de tabacs fabriqués dont la TVA est perçue à la sortie de "
+"l'entrepôt fiscal conjointement avec les accises"
+
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_base_17
 msgid "721"
@@ -1239,7 +1291,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_17
 msgid "721 - for business purposes: base 17%"
-msgstr ""
+msgstr "721 - à des fins de l'entreprise: base 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_tax_17
@@ -1249,7 +1301,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_17
 msgid "722 - for business purposes: tax 17%"
-msgstr ""
+msgstr "722 - à des fins de l'entreprise: taxe 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_base_14
@@ -1259,7 +1311,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_14
 msgid "723 - for business purposes: base 14%"
-msgstr ""
+msgstr "723 - à des fins de l'entreprise: base 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_tax_14
@@ -1269,7 +1321,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_14
 msgid "724 - for business purposes: tax 14%"
-msgstr ""
+msgstr "724 - à des fins de l'entreprise: taxe 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_base_8
@@ -1279,7 +1331,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_8
 msgid "725 - for business purposes: base 8%"
-msgstr ""
+msgstr "725 - à des fins de l'entreprise: base 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_tax_8
@@ -1289,8 +1341,22 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_8
 msgid "726 - for business purposes: tax 8%"
+msgstr "726 - à des fins de l'entreprise: taxe 8%"
+
+#. module: l10n_lu
+#: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_manufactured_tobacco
+msgid "729"
 msgstr ""
 
+#. module: l10n_lu
+#: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_manufactured_tobacco
+msgid ""
+"729 - of manufactured tobacco (VAT is collected at the exit of the tax "
+"warehouse with excise duties)"
+msgstr ""
+"729 - de tabacs fabriqués dont la TVA est perçue à la sortie de "
+"l'entrepôt fiscal conjointement avec les accises"
+
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_base_17
 msgid "731"
@@ -1299,7 +1365,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_17
 msgid "731 - for non-business purposes: base 17%"
-msgstr ""
+msgstr "731 - à des fins étrangères à l'entreprise: base 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_tax_17
@@ -1309,7 +1375,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_17
 msgid "732 - for non-business purposes: tax 17%"
-msgstr ""
+msgstr "732 - à des fins étrangères à l'entreprise: taxe 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_base_14
@@ -1319,7 +1385,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_14
 msgid "733 - for non-business purposes: base 14%"
-msgstr ""
+msgstr "733 - à des fins étrangères à l'entreprise: base 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_tax_14
@@ -1329,7 +1395,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_14
 msgid "734 - for non-business purposes: tax 14%"
-msgstr ""
+msgstr "734 - à des fins étrangères à l'entreprise: taxe 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_base_8
@@ -1339,7 +1405,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_8
 msgid "735 - for non-business purposes: base 8%"
-msgstr ""
+msgstr "735 - à des fins étrangères à l'entreprise: base 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_tax_8
@@ -1349,7 +1415,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_8
 msgid "736 - for non-business purposes: tax 8%"
-msgstr ""
+msgstr "736 - à des fins étrangères à l'entreprise: taxe 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_base_17
@@ -1359,7 +1425,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_17
 msgid "741 - not exempt within the territory: base 17%"
-msgstr ""
+msgstr "741 - non exonérées à l'intérieur du pays: base 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_tax_17
@@ -1369,7 +1435,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_17
 msgid "742 - not exempt within the territory: tax 17%"
-msgstr ""
+msgstr "742 - non exonérées à l'intérieur du pays: taxe 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_base_14
@@ -1379,7 +1445,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_14
 msgid "743 - not exempt within the territory: base 14%"
-msgstr ""
+msgstr "743 - non exonérées à l'intérieur du pays: base 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_tax_14
@@ -1389,7 +1455,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_14
 msgid "744 - not exempt within the territory: tax 14%"
-msgstr ""
+msgstr "744 - non exonérées à l'intérieur du pays: taxe 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_base_8
@@ -1399,7 +1465,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_8
 msgid "745 - not exempt within the territory: base 8%"
-msgstr ""
+msgstr "745 - non exonérées à l'intérieur du pays: base 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_1_a_tax_8
@@ -1409,7 +1475,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_8
 msgid "746 - not exempt within the territory: tax 8%"
-msgstr ""
+msgstr "746 - non exonérées à l'intérieur du pays: taxe 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_base_17
@@ -1419,7 +1485,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_17
 msgid "751 - not established or residing within the Community: base 17%"
-msgstr ""
+msgstr "751 - effectuées au déclarant par des assujettis établis en dehors "
+"de la Communauté: base 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_tax_17
@@ -1429,7 +1496,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_17
 msgid "752 - not established or residing within the Community: tax 17%"
-msgstr ""
+msgstr "752 - effectuées au déclarant par des assujettis établis en dehors "
+"de la Communauté: taxe 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_base_14
@@ -1439,7 +1507,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_14
 msgid "753 - not established or residing within the Community: base 14%"
-msgstr ""
+msgstr "753 - effectuées au déclarant par des assujettis établis en dehors "
+"de la Communauté: base 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_tax_14
@@ -1449,7 +1518,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_14
 msgid "754 - not established or residing within the Community: tax 14%"
-msgstr ""
+msgstr "754 - effectuées au déclarant par des assujettis établis en dehors "
+"de la Communauté: taxe 14%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_base_8
@@ -1459,7 +1529,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_8
 msgid "755 - not established or residing within the Community: base 8%"
-msgstr ""
+msgstr "755 - effectuées au déclarant par des assujettis établis en dehors "
+"de la Communauté: base 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_2_tax_8
@@ -1469,7 +1540,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_8
 msgid "756 - not established or residing within the Community: tax 8%"
-msgstr ""
+msgstr "756 - effectuées au déclarant par des assujettis établis en dehors "
+"de la Communauté: taxe 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_3_base_17
@@ -1479,7 +1551,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_3_base_17
 msgid "761 - suppliers established within the territory: base 17%"
-msgstr ""
+msgstr "761 - effectuées au déclarant par des assujettis établis "
+"à l'intérieur du pays: base 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2e_3_tax_17
@@ -1489,7 +1562,8 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax_17
 msgid "762 - suppliers established within the territory: tax 17%"
-msgstr ""
+msgstr "762 - effectuées au déclarant par des assujettis établis "
+"à l'intérieur du pays: taxe 17%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2f_supply_goods_base_8
@@ -1509,7 +1583,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_8
 msgid "764 - tax 8%"
-msgstr ""
+msgstr "764 - taxe 8%"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_3_base
@@ -1519,7 +1593,7 @@ msgstr ""
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax
 msgid "766 - tax"
-msgstr ""
+msgstr "766 - taxe"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base
@@ -1527,6 +1601,7 @@ msgid ""
 "767 - Supply of goods for which the purchaser is liable for the payment of "
 "VAT - base"
 msgstr ""
+"767 - Livraisons de biens à déclarer par l'acquéreur redevable de la taxe - base"
 
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax
@@ -1534,6 +1609,7 @@ msgid ""
 "768 - Supply of goods for which the purchaser is liable for the payment of "
 "VAT - tax"
 msgstr ""
+"768 - Livraisons de biens à déclarer par l'acquéreur redevable de la taxe - taxe"
 
 #. module: l10n_lu
 #: model:account.tax.template,name:l10n_lu.lu_2015_tax_FB-PA-8

addons/l10n_lu/i18n_extra/l10n_lu.pot

@@ -388,6 +388,18 @@ msgid ""
 " is applied"
 msgstr ""
 
+#. module: l10n_lu
+#: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_3b2_input_tax_margin
+msgid "096"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3b2_input_tax_margin
+msgid ""
+"096 - Non recoverable input tax in accordance with Art. 56ter-1(7) and "
+"56ter-2(7) (when applying the margin scheme)"
+msgstr ""
+
 #. module: l10n_lu
 #: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_3b_total_input_tax_nd
 msgid "097 - Total input tax non-deductible"
@@ -1231,6 +1243,18 @@ msgstr ""
 msgid "716 - tax 8%"
 msgstr ""
 
+#. module: l10n_lu
+#: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2b_manufactured_tobacco
+msgid "719"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2b_manufactured_tobacco
+msgid ""
+"719 - of manufactured tobacco (VAT is collected at the exit of the tax "
+"warehouse with excise duties)"
+msgstr ""
+
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_base_17
 msgid "721"
@@ -1291,6 +1315,18 @@ msgstr ""
 msgid "726 - for business purposes: tax 8%"
 msgstr ""
 
+#. module: l10n_lu
+#: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_1_manufactured_tobacco
+msgid "729"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.tax.report.line,name:l10n_lu.account_tax_report_line_2d_1_manufactured_tobacco
+msgid ""
+"729 - of manufactured tobacco (VAT is collected at the exit of the tax "
+"warehouse with excise duties)"
+msgstr ""
+
 #. module: l10n_lu
 #: model:account.tax.report.line,tag_name:l10n_lu.account_tax_report_line_2d_2_base_17
 msgid "731"

addons/payment_payulatam/models/payment.py

@@ -10,7 +10,7 @@ from werkzeug import urls
 
 from flectra import api, fields, models, _
 from flectra.addons.payment.models.payment_acquirer import ValidationError
-from flectra.tools.float_utils import float_compare
+from flectra.tools.float_utils import float_compare, float_round
 
 
 _logger = logging.getLogger(__name__)
@@ -57,7 +57,7 @@ class PaymentAcquirerPayulatam(models.Model):
             accountId=self.payulatam_account_id,
             description=values.get('reference'),
             referenceCode=tx.reference,
-            amount=values['amount'],
+            amount=float_round(values['amount'], 2),
             tax='0',  # This is the transaction VAT. If VAT zero is sent the system, 19% will be applied automatically. It can contain two decimals. Eg 19000.00. In the where you do not charge VAT, it should should be set as 0.
             taxReturnBase='0',
             currency=values['currency'].name,

addons/point_of_sale/static/src/js/Screens/ClientListScreen/ClientDetailsEdit.js

@@ -56,9 +56,6 @@ flectra.define('point_of_sale.ClientDetailsEdit', function(require) {
                 });
             }
             processedChanges.id = this.props.partner.id || false;
-            if (!this.props.partner.id) {
-                processedChanges.company_id = this.env.pos.company.id;
-            }
             this.trigger('save-changes', { processedChanges });
         }
         async uploadImage(event) {

addons/point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreen.js

@@ -187,7 +187,7 @@ flectra.define('point_of_sale.PaymentScreen', function (require) {
                     syncedOrderBackendIds = await this.env.pos.push_single_order(this.currentOrder);
                 }
             } catch (error) {
-                if (error.code == 700)
+                if (error.code == 700 || error.code == 701)
                     this.error = true;
                 if (error instanceof Error) {
                     throw error;

addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductScreen.js

@@ -279,23 +279,23 @@ flectra.define('point_of_sale.ProductScreen', function(require) {
                 startingValue: 0,
                 title: this.env._t('Set the new quantity'),
             });
-            let newQuantity = inputNumber !== "" ? parse.float(inputNumber) : null;
-            if (confirmed && newQuantity !== null) {
-                let order = this.env.pos.get_order();
-                let selectedLine = this.env.pos.get_order().get_selected_orderline();
-                let currentQuantity = selectedLine.get_quantity()
-                if(selectedLine.is_last_line() && currentQuantity === 1 && newQuantity < currentQuantity)
-                    selectedLine.set_quantity(newQuantity);
-                else if(newQuantity >= currentQuantity)
-                    selectedLine.set_quantity(newQuantity);
-                else {
-                    let newLine = selectedLine.clone();
-                    let decreasedQuantity = currentQuantity - newQuantity
-                    newLine.order = order;
+            if(!confirmed)
+                return;
+            let newQuantity = parse.float(inputNumber);
+            let order = this.env.pos.get_order();
+            let selectedLine = this.env.pos.get_order().get_selected_orderline();
+            let currentQuantity = selectedLine.get_quantity()
+            if(selectedLine.is_last_line() && currentQuantity === 1 && newQuantity < currentQuantity)
+                selectedLine.set_quantity(newQuantity);
+            else if(newQuantity >= currentQuantity)
+                selectedLine.set_quantity(newQuantity);
+            else {
+                let newLine = selectedLine.clone();
+                let decreasedQuantity = currentQuantity - newQuantity
+                newLine.order = order;
 
-                    newLine.set_quantity( - decreasedQuantity, true);
-                    order.add_orderline(newLine);
-                }
+                newLine.set_quantity( - decreasedQuantity, true);
+                order.add_orderline(newLine);
             }
         }
         async _onClickCustomer() {

addons/point_of_sale/static/src/js/custom_hooks.js

@@ -39,13 +39,24 @@ flectra.define('point_of_sale.custom_hooks', function (require) {
                         this.env._t('The server encountered an error while receiving your order.'),
                 });
             } else if (error.code === 700) {
-                // Fiscal module errors
+                // Sweden Fiscal module errors
                 await this.showPopup('ErrorPopup', {
                     title: this.env._t('Fiscal data module error'),
                     body:
                         error.data.error.status ||
                         this.env._t('The fiscal data module encountered an error while receiving your order.'),
                 });
+            } else if (error.code === 701) {
+                // Belgian Fiscal module errors
+                let bodyMessage = "";
+                if(error.error.errorCode)
+                    bodyMessage = "'" + error.error.errorCode + "': " + error.error.errorMessage;
+                else
+                    bodyMessage = "Fiscal data module is not on.";
+                await this.showPopup('ErrorPopup', {
+                    title: this.env._t('Fiscal data module error'),
+                    body: bodyMessage
+                });
             } else {
                 // ???
                 await this.showPopup('ErrorPopup', {

addons/point_of_sale/static/src/js/db.js

@@ -502,7 +502,7 @@ var PosDB = core.Class.extend({
         var saved = this.load('unpaid_orders',[]);
         var orders = [];
         saved.forEach(function(o) {
-            if (ids.includes(o.id)){
+            if (ids.includes(o.id) && (o.data.server_id || o.data.lines.length || o.data.statement_ids.length)){
                 orders.push(o);
             }
         });

addons/product/models/product.py

@@ -175,6 +175,15 @@ class ProductProduct(models.Model):
             else:
                 record.image_variant_1920 = record.image_1920
 
+    @api.depends("create_date", "write_date", "product_tmpl_id.create_date", "product_tmpl_id.write_date")
+    def compute_concurrency_field_with_access(self):
+        # Intentionally not calling super() to involve all fields explicitly
+        for record in self:
+            record[self.CONCURRENCY_CHECK_FIELD] = max(filter(None, (
+                record.product_tmpl_id.write_date or record.product_tmpl_id.create_date,
+                record.write_date or record.create_date or fields.Datetime.now(),
+            )))
+
     def _compute_image_1024(self):
         """Get the image from the template if no image is set on the variant."""
         for record in self:

addons/product/tests/test_variants.py

@@ -3,6 +3,7 @@
 
 import base64
 from collections import OrderedDict
+from datetime import datetime, timedelta
 import io
 import unittest.mock
 
@@ -624,6 +625,20 @@ class TestVariantsImages(common.TestProductCommon):
         """Check that on variant, the image used is the image_variant_1920 if set,
         and defaults to the template image otherwise.
         """
+        # Pretend setup happened in an older transaction by updating on the SQL layer and making sure it gets reloaded
+        # Using _write() instead of write() because write() only allows updating log access fields at boot time
+        before = datetime.now() - timedelta(hours=1)
+        self.template._write({
+            'create_date': before,
+            'write_date': before,
+        })
+        self.variants._write({
+            'create_date': before,
+            'write_date': before,
+        })
+        self.template.invalidate_cache(['create_date', 'write_date'], self.template.ids)
+        self.variants.invalidate_cache(['create_date', 'write_date'], self.variants.ids)
+
         f = io.BytesIO()
         Image.new('RGB', (800, 500), '#000000').save(f, 'PNG')
         f.seek(0)
@@ -633,8 +648,11 @@ class TestVariantsImages(common.TestProductCommon):
         self.assertEqual(len(set(images)), 4)
 
         variant_no_image = self.variants[0]
+        old_last_update = variant_no_image['__last_update']
         self.assertFalse(variant_no_image.image_1920)
         self.template.image_1920 = image_black
+        self.template.write({'write_date': datetime.now()})
+        new_last_update = variant_no_image['__last_update']
 
         # the first has no image variant, all the others do
         self.assertFalse(variant_no_image.image_variant_1920)
@@ -645,6 +663,9 @@ class TestVariantsImages(common.TestProductCommon):
         # having changed the template image should not have changed these
         self.assertEqual(images[1:], self.variants.mapped('image_1920')[1:])
 
+        # last update changed for the variant without image
+        self.assertLess(old_last_update, new_last_update)
+
     def test_update_images_with_archived_variants(self):
         """Update images after variants have been archived"""
         self.variants[1:].write({'active': False})

addons/purchase_stock/models/purchase.py

@@ -333,6 +333,10 @@ class PurchaseOrderLine(models.Model):
         lines = self.filtered(lambda l: l.order_id.state == 'purchase')
         previous_product_qty = {line.id: line.product_uom_qty for line in lines}
         result = super(PurchaseOrderLine, self).write(values)
+        if 'price_unit' in values:
+            for line in lines:
+                moves = line.move_ids.filtered(lambda s: s.state not in ('cancel', 'done'))
+                moves.write({'price_unit': line._get_stock_move_price_unit()})
         if 'product_qty' in values:
             lines.with_context(previous_product_qty=previous_product_qty)._create_or_update_picking()
         return result

addons/purchase_stock/tests/test_purchase_order.py

@@ -41,6 +41,19 @@ class TestPurchaseOrder(ValuationReconciliationTestCommon):
                 })],
         }
 
+    def test_update_price_unit(self):
+        self.po_vals["order_line"] = [self.po_vals["order_line"][0]]
+        # we only need one purchase line for this test
+        po = self.env['purchase.order'].create(self.po_vals)
+        pol = po.order_line[0]
+        po.button_confirm()
+        self.assertEqual(len(pol.move_ids), 1)
+        self.assertEqual(pol.move_ids[0].price_unit, 500)
+        pol.price_unit = 1
+        self.assertEqual(pol.price_unit, 1)
+        # line below shouldn't fail
+        self.assertEqual(pol.move_ids[0].price_unit, 1)
+
     def test_00_purchase_order_flow(self):
         # Ensure product_id_2 doesn't have res_partner_1 as supplier
         if self.partner_a in self.product_id_2.seller_ids.mapped('name'):

addons/purchase_stock/tests/test_stockvaluation.py

@@ -87,8 +87,8 @@ class TestStockValuation(TransactionCase):
         # update the unit price on the purchase order line
         po1.order_line.price_unit = 200
 
-        # the unit price on the stock move is not directly updated
-        self.assertEqual(move1.price_unit, 100)
+        # the unit price on the stock move is updated
+        self.assertEqual(move1.price_unit, 200)
 
         # validate the receipt
         res_dict = picking1.button_validate()

addons/website_mass_mailing/views/snippets_templates.xml

@@ -14,13 +14,19 @@
 
 <template id="snippets" inherit_id="website.snippets">
     <xpath expr="//t[@id='mass_mailing_newsletter_block_hook']" position="replace">
-        <t t-snippet="website_mass_mailing.s_newsletter_block" t-thumbnail="/website_mass_mailing/static/src/img/snippets_thumbs/s_newsletter_block.svg"/>
+        <!-- This snippet cannot be used in sanitized fields -->
+        <!-- because it contains inputs that would be removed -->
+        <t t-snippet="website_mass_mailing.s_newsletter_block" t-thumbnail="/website_mass_mailing/static/src/img/snippets_thumbs/s_newsletter_block.svg" t-forbid-sanitize="form"/>
     </xpath>
     <xpath expr="//t[@id='mass_mailing_newsletter_popup_hook']" position="replace">
-        <t t-snippet="website_mass_mailing.s_newsletter_subscribe_popup" t-thumbnail="/website/static/src/img/snippets_thumbs/newsletter_subscribe_popup.svg"/>
+        <!-- This snippet cannot be used in sanitized fields -->
+        <!-- because it contains inputs that would be removed -->
+        <t t-snippet="website_mass_mailing.s_newsletter_subscribe_popup" t-thumbnail="/website/static/src/img/snippets_thumbs/newsletter_subscribe_popup.svg" t-forbid-sanitize="form"/>
     </xpath>
     <xpath expr="//t[@id='mass_mailing_newsletter_hook']" position="replace">
-        <t t-snippet="website_mass_mailing.s_newsletter_subscribe_form" t-thumbnail="/website/static/src/img/snippets_thumbs/s_newsletter_subscribe_form.svg"/>
+        <!-- This snippet cannot be used in sanitized fields -->
+        <!-- because it contains inputs that would be removed -->
+        <t t-snippet="website_mass_mailing.s_newsletter_subscribe_form" t-thumbnail="/website/static/src/img/snippets_thumbs/s_newsletter_subscribe_form.svg" t-forbid-sanitize="form"/>
     </xpath>
 </template>
 

addons/website_sale/tests/__init__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo, Flectra. See LICENSE file for full copyright and licensing details.
 
+from . import common
 from . import test_customize
 from . import test_sale_process
 from . import test_sitemap

addons/website_sale/tests/common.py

@@ -0,0 +1,23 @@
+from flectra.tests.common import TransactionCase
+
+class TestWebsiteSaleCommon(TransactionCase):
+
+    def setUp(self):
+        super(TestWebsiteSaleCommon, self).setUp()
+        # Reset country and fiscal country, so that fields added by localizations are
+        # hidden and non-required.
+        # Also remove default taxes from the company and its accounts, to avoid inconsistencies
+        # with empty fiscal country.
+        self.env.company.write({
+            'country_id': None, # Also resets account_fiscal_country_id
+            'account_sale_tax_id': None,
+            'account_purchase_tax_id': None,
+        })
+        account_with_taxes = self.env['account.account'].search([('tax_ids', '!=', False), ('company_id', '=', self.env.company.id)])
+        account_with_taxes.write({
+            'tax_ids': [(5, 0, 0)],
+        })
+        # Update website pricelist to ensure currency is same as env.company
+        website = self.env['website'].get_current_website()
+        pricelist = website.get_current_pricelist()
+        pricelist.write({'currency_id': self.env.company.currency_id.id})

addons/website_sale/tests/test_sale_process.py

@@ -6,11 +6,12 @@ import flectra.tests
 from flectra import api
 from flectra.addons.base.tests.common import HttpCaseWithUserDemo, TransactionCaseWithUserDemo
 from flectra.addons.website_sale.controllers.main import WebsiteSale
+from flectra.addons.website_sale.tests.common import TestWebsiteSaleCommon
 from flectra.addons.website.tools import MockRequest
 
 
 @flectra.tests.tagged('post_install', '-at_install')
-class TestUi(HttpCaseWithUserDemo):
+class TestUi(HttpCaseWithUserDemo, TestWebsiteSaleCommon):
 
     def setUp(self):
         super(TestUi, self).setUp()

addons/website_sale/tests/test_website_sale_image.py

@@ -3,13 +3,14 @@
 import base64
 import io
 
+from flectra.addons.website_sale.tests.common import TestWebsiteSaleCommon
 from PIL import Image
 
 import flectra.tests
 
 
 @flectra.tests.common.tagged('post_install', '-at_install')
-class TestWebsiteSaleImage(flectra.tests.HttpCase):
+class TestWebsiteSaleImage(flectra.tests.HttpCase, TestWebsiteSaleCommon):
 
     # registry_test_mode = False  # uncomment to save the product to test in browser
 

addons/website_sale/tests/test_website_sale_product_attribute_value_config.py

@@ -4,6 +4,7 @@
 from flectra.addons.sale.tests.test_sale_product_attribute_value_config import TestSaleProductAttributeValueCommon
 from flectra.tests import tagged
 from flectra.addons.website.tools import MockRequest
+from flectra.addons.website_sale.tests.common import TestWebsiteSaleCommon
 
 
 @tagged('post_install', '-at_install')
@@ -148,7 +149,7 @@ class TestWebsiteSaleProductAttributeValueConfig(TestSaleProductAttributeValueCo
         self.assertEqual(combination_info['price_extra'], 173.91, "173.91$ + 0% tax (mapped from fp 15% -> 0% for BE)")
 
 @tagged('post_install', '-at_install')
-class TestWebsiteSaleProductPricelist(TestSaleProductAttributeValueCommon):
+class TestWebsiteSaleProductPricelist(TestSaleProductAttributeValueCommon, TestWebsiteSaleCommon):
     def test_cart_update_with_fpos(self):
         # We will test that the mapping of an 10% included tax by a 0% by a fiscal position is taken into account when updating the cart 
         self.env.user.partner_id.country_id = False

addons/website_sale_comparison/static/src/js/website_sale_comparison.js

@@ -192,8 +192,12 @@ var ProductComparison = publicWidget.Widget.extend(VariantMixin, {
         var self = this;
         this.$('.o_comparelist_products .o_product_row').remove();
         _.each(this.comparelist_product_ids, function (res) {
-            var $template = self.product_data[res].render;
-            self.$('.o_comparelist_products').append($template);
+            if (self.product_data.hasOwnProperty(res)) {
+                // It is possible that we do not have the required product_data for all IDs in
+                // comparelist_product_ids
+                var $template = self.product_data[res].render;
+                self.$('.o_comparelist_products').append($template);
+            }
         });
         if (force !== 'hide' && (this.comparelist_product_ids.length > 1 || force === 'show')) {
             $('#comparelist .o_product_panel_header').popover('show');