Italiano
-Questo modulo consente di importare i file XML delle fatture elettroniche, versione 1.2
+Questo modulo consente di importare i file XML della fattura elettronica versione 1.2
http://www.fatturapa.gov.it/export/fatturazione/it/normativa/f-2.htm
-ricevute attraverso il Sistema di Interscambio (SDI)
+ricevuti attraverso il Sistema di Interscambio (SdI).
http://www.fatturapa.gov.it/export/fatturazione/it/sdi.htm
English
-This module allows to import XML files of electronic bills, version 1.2
+This module allows to import Electronic Bill XML files version 1.2
http://www.fatturapa.gov.it/export/fatturazione/en/normativa/f-2.htm
-received through the Exchange System (ES)
+received through the Exchange System (ES).
http://www.fatturapa.gov.it/export/fatturazione/en/sdi.htm
Table of contents
- Minimum level: Bill is created with no lines; User will have to create them, according to what specified in the electronic bill
-- Maximum level: every line contained in electronic bill will create a line in bill
+- Maximum level: Every line contained in electronic bill will create a line in bill
Moreover, in supplier form you can set the ‘E-bill Default Product’: this product will be used, during generation of bills, when no other possible product is found. Tax and account of bill line will be set according to what configured in the product.
@@ -436,7 +436,7 @@Italiano
-
- Andare su Contabilità → Acquisti → Fattura elettronica
+- Andare in Contabilità → Acquisti → Fattura elettronica
- Caricare un file XML
- Visualizzare il contenuto della fattura facendo clic su “Mostra anteprima”
- Eseguire la procedura guidata “Importa e-fattura” per creare una fattura in bozza oppure “Collega a fattura esistente” per collegare il file XML a una fattura già (automaticamente) creata
diff --git a/l10n_it_fatturapa_in/tests/test_import_fatturapa_xml.py b/l10n_it_fatturapa_in/tests/test_import_fatturapa_xml.py index feddfcc3975c..0e9dd2959863 100644 --- a/l10n_it_fatturapa_in/tests/test_import_fatturapa_xml.py +++ b/l10n_it_fatturapa_in/tests/test_import_fatturapa_xml.py @@ -200,8 +200,8 @@ def test_04_xml_import(self): e_line.cod_article_ids[0].code_val, '12345') self.assertEqual( invoice.inconsistencies, - u'Company Name field contains "Societa\' ' - 'Alpha SRL". Your System contains "SOCIETA\' ALPHA SRL"\n\n') + u"Company Name field contains 'Societa\' " + "Alpha SRL'. Your System contains 'SOCIETA\' ALPHA SRL'\n\n") def test_05_xml_import(self): self.env.user.company_id.dati_bollo_product_id = ( @@ -330,12 +330,12 @@ def test_13_xml_import(self): invoice2 = self.invoice_model.browse(invoice2_id) self.assertEqual( invoice1.inconsistencies, - u'Company Name field contains "Societa\' ' - 'Alpha SRL". Your System contains "SOCIETA\' ALPHA SRL"\n\n') + u"Company Name field contains 'Societa\' " + "Alpha SRL'. Your System contains 'SOCIETA\' ALPHA SRL'\n\n") self.assertEqual( invoice2.inconsistencies, - u'Company Name field contains "Societa\' ' - 'Alpha SRL". Your System contains "SOCIETA\' ALPHA SRL"\n\n') + u"Company Name field contains 'Societa\' " + "Alpha SRL'. Your System contains 'SOCIETA\' ALPHA SRL'\n\n") def test_14_xml_import(self): # check: no tax code found , write inconsisteance and anyway @@ -349,12 +349,12 @@ def test_14_xml_import(self): self.assertEqual(invoice.amount_tax, 0.0) self.assertEqual( invoice.inconsistencies, - u'Company Name field contains "Societa\' ' - 'Alpha SRL". Your System contains "SOCIETA\' ALPHA SRL"\n\n' - 'XML contains tax with percentage "15.55"' - ' but it does not exist in your system\n' - 'XML contains tax with percentage "15.55"' - ' but it does not exist in your system') + u"Company Name field contains 'Societa\' " + "Alpha SRL'. Your System contains 'SOCIETA\' ALPHA SRL'\n\n" + u"XML contains tax with percentage '15.55'" + " but it does not exist in your system\n" + "XML contains tax with percentage '15.55'" + " but it does not exist in your system") def test_15_xml_import(self): self.wt = self.create_wt() diff --git a/l10n_it_fatturapa_in/views/account_view.xml b/l10n_it_fatturapa_in/views/account_view.xml index b484e947de0e..872c9d4f2ae4 100644 --- a/l10n_it_fatturapa_in/views/account_view.xml +++ b/l10n_it_fatturapa_in/views/account_view.xml @@ -273,7 +273,7 @@ -+ - diff --git a/l10n_it_fatturapa_in/wizard/link_to_existing_invoice.py b/l10n_it_fatturapa_in/wizard/link_to_existing_invoice.py index dbaf266d02f7..08588706ceea 100644 --- a/l10n_it_fatturapa_in/wizard/link_to_existing_invoice.py +++ b/l10n_it_fatturapa_in/wizard/link_to_existing_invoice.py @@ -15,5 +15,5 @@ def link(self): self.ensure_one() active_ids = self.env.context.get('active_ids') if len(active_ids) != 1: - raise UserError(_("You can select only 1 XML file to link")) + raise UserError(_("You can select only one XML file to link.")) self.invoice_id.fatturapa_attachment_in_id = active_ids[0] diff --git a/l10n_it_fatturapa_in/wizard/wizard_import_fatturapa.py b/l10n_it_fatturapa_in/wizard/wizard_import_fatturapa.py index 01cedc3fdc28..6a1af4dcebdf 100644 --- a/l10n_it_fatturapa_in/wizard/wizard_import_fatturapa.py +++ b/l10n_it_fatturapa_in/wizard/wizard_import_fatturapa.py @@ -21,7 +21,7 @@ class WizardImportFatturapa(models.TransientModel): # ('1', 'Aliquote'), ('2', 'Maximum'), ], string="E-bills Detail Level", - help="Minumum level: Bill is created with no lines; " + help="Minimum level: Bill is created with no lines; " "User will have to create them, according to what specified in " "the electronic bill.\n" # "Livello Aliquote: viene creata una riga fattura per ogni " @@ -43,7 +43,7 @@ def default_get(self, fields): fatturapa_attachment_id) if fatturapa_attachment.in_invoice_ids: raise UserError( - _("File %s is linked to bills yet") + _("File %s is linked to bills yet.") % fatturapa_attachment.name) partners |= fatturapa_attachment.xml_supplier_id if len(partners) == 1: @@ -82,16 +82,16 @@ def check_partner_base_data(self, partner_id, DatiAnagrafici): partner.name != DatiAnagrafici.Anagrafica.Denominazione ): self.log_inconsistency(_( - "Company Name field contains \"%s\"." - " Your System contains \"%s\"" + "Company Name field contains '%s'." + " Your System contains '%s'" ) % (DatiAnagrafici.Anagrafica.Denominazione, partner.name)) if ( DatiAnagrafici.Anagrafica.Nome and partner.firstname != DatiAnagrafici.Anagrafica.Nome ): self.log_inconsistency(_( - "Name field contains \"%s\"." - " Your System contains \"%s\"" + "Name field contains '%s'." + " Your System contains '%s'" ) % (DatiAnagrafici.Anagrafica.Nome, partner.firstname)) if ( DatiAnagrafici.Anagrafica.Cognome and @@ -99,8 +99,8 @@ def check_partner_base_data(self, partner_id, DatiAnagrafici): ): self.log_inconsistency( _( - "Surname field contains \"%s\"." - " Your System contains \"%s\"" + "Surname field contains '%s'." + " Your System contains '%s'" ) % (DatiAnagrafici.Anagrafica.Cognome, partner.lastname) ) @@ -131,7 +131,7 @@ def getPartnerBase(self, DatiAnagrafici): raise UserError( _("Two distinct partners with " "VAT number %s and Fiscal Code %s already " - "present in db" % + "present in db." % (vat, cf)) ) if partners: @@ -148,7 +148,7 @@ def getPartnerBase(self, DatiAnagrafici): country_id = countries[0].id else: raise UserError( - _("Country Code %s not found in system") % CountryCode + _("Country Code %s not found in system.") % CountryCode ) vals = { 'vat': vat, @@ -214,7 +214,7 @@ def getCedPrest(self, cedPrest): ) if not FiscalPos: raise UserError( - _('Tax Regime %s not present in your system') + _('Tax Regime %s not present in your system.') % rfPos ) else: @@ -277,12 +277,12 @@ def _prepare_generic_line_data(self, line): if not account_taxes: raise UserError( _('No tax with percentage ' - '%s and nature %s found. Please configure this tax') + '%s and nature %s found. Please configure this tax.') % (line.AliquotaIVA, line.Natura)) if len(account_taxes) > 1: raise UserError( _('Too many taxes with percentage ' - '%s and nature %s found') + '%s and nature %s found.') % (line.AliquotaIVA, line.Natura)) else: account_taxes = account_tax_model.search( @@ -297,8 +297,8 @@ def _prepare_generic_line_data(self, line): if not account_taxes: self.log_inconsistency( _( - 'XML contains tax with percentage "%s" ' - 'but it does not exist in your system' + "XML contains tax with percentage '%s' " + "but it does not exist in your system" ) % line.AliquotaIVA ) # check if there are multiple taxes with @@ -307,7 +307,7 @@ def _prepare_generic_line_data(self, line): # just logging because this is an usual case: see split payment _logger.warning(_( "Line '%s': Too many taxes with percentage equals " - "to \"%s\"\nfix it if required" + "to '%s'.\n Fix it if required" ) % (line.Descrizione, line.AliquotaIVA)) # if there are multiple taxes with same percentage # and there is a default tax with this percentage, @@ -477,7 +477,7 @@ def _prepareWelfareLine(self, invoice_id, line): WelfareTypeModel = self.env['welfare.fund.type'] if not TipoCassa: raise UserError( - _('Welfare Fund is not defined ') + _('Welfare Fund is not defined.') ) WelfareType = WelfareTypeModel.search( [('name', '=', TipoCassa)] @@ -495,7 +495,7 @@ def _prepareWelfareLine(self, invoice_id, line): } if not WelfareType: raise UserError( - _('Welfare Fund %s not present in your system') % TipoCassa) + _('Welfare Fund %s not present in your system.') % TipoCassa) else: res['name'] = WelfareType[0].id @@ -607,7 +607,7 @@ def _createPayamentsLine(self, payment_id, line, partner_id): if not method: raise UserError( _( - 'Payment method %s is not defined in your system' + 'Payment method %s is not defined in your system.' % dline.ModalitaPagamento ) ) @@ -664,7 +664,7 @@ def _createPayamentsLine(self, payment_id, line, partner_id): if not banks: if not dline.IstitutoFinanziario: self.log_inconsistency( - _("Name of Bank with BIC \"%s\" is not set." + _("Name of Bank with BIC '%s' is not set." " Can't create bank") % dline.BIC ) else: @@ -744,8 +744,8 @@ def get_purchase_journal(self, company): if not journals: raise UserError( _( - 'Define a purchase journal ' - 'for this company: "%s" (id:%d).' + "Define a purchase journal " + "for this company: '%s' (id: %d)." ) % (company.name, company.id) ) return journals[0] @@ -827,7 +827,7 @@ def invoiceCreate( if not currency: raise UserError( _( - 'No currency found with code %s' + 'No currency found with code %s.' % FatturaBody.DatiGenerali.DatiGeneraliDocumento.Divisa ) ) @@ -849,7 +849,7 @@ def invoiceCreate( docType_id = docType_record[0].id else: raise UserError( - _("Document type %s not handled") + _("Document type %s not handled.") % docType) if docType == 'TD04': invtype = 'in_refund' @@ -902,7 +902,7 @@ def invoiceCreate( "The bill contains withholding tax with " "payment reason %s, " "but such a tax is not found in your system. Please " - "set it" + "set it." ) % Withholding.CausalePagamento) wt_found = False for wt in wts: @@ -912,7 +912,7 @@ def invoiceCreate( if not wt_found: raise UserError(_( "No withholding tax found with " - "document payment reason %s and rate %s" + "document payment reason %s and rate %s." ) % ( Withholding.CausalePagamento, Withholding.AliquotaRitenuta )) @@ -962,7 +962,7 @@ def invoiceCreate( if not wt_found: raise UserError(_( "Welfare Fund data %s has withholding tax but no " - "withholding tax was found in the system" + "withholding tax was found in the system." % walfareLine.TipoCassa)) line_vals['invoice_line_tax_wt_ids'] = [ (6, 0, [wt_found.id])] @@ -1137,12 +1137,12 @@ def invoiceCreate( cond = PaymentLine.CondizioniPagamento or False if not cond: raise UserError( - _('Payment method Code not found in document') + _('Payment method code not found in document.') ) terms = PaymentTermsModel.search([('code', '=', cond)]) if not terms: raise UserError( - _('Payment method Code %s is incorrect') % cond + _('Payment method code %s is incorrect.') % cond ) else: term_id = terms[0].id @@ -1204,7 +1204,7 @@ def check_invoice_amount(self, invoice, FatturaElettronicaBody): invoice.amount_total-ImportoTotaleDocumento, precision_digits=2 ): self.log_inconsistency( - _('Invoice total %s is different from ' + _('Bill total %s is different from ' 'document total amount %s') % (invoice.amount_total, ImportoTotaleDocumento) ) @@ -1242,7 +1242,7 @@ def importFatturaPA(self): fatturapa_attachment_id) if fatturapa_attachment.in_invoice_ids: raise UserError( - _("File is linked to bills yet")) + _("File is linked to bills yet.")) fatt = self.get_invoice_obj(fatturapa_attachment) cedentePrestatore = fatt.FatturaElettronicaHeader.CedentePrestatore # 1.2 diff --git a/l10n_it_fatturapa_in/wizard/wizard_import_fatturapa_view.xml b/l10n_it_fatturapa_in/wizard/wizard_import_fatturapa_view.xml index 846c5a5d83ac..c064828bb51c 100644 --- a/l10n_it_fatturapa_in/wizard/wizard_import_fatturapa_view.xml +++ b/l10n_it_fatturapa_in/wizard/wizard_import_fatturapa_view.xml @@ -18,7 +18,7 @@