diff --git a/l10n_ro_invoice_report/i18n/ro.po b/l10n_ro_invoice_report/i18n/ro.po index 8a3bef93..13054453 100644 --- a/l10n_ro_invoice_report/i18n/ro.po +++ b/l10n_ro_invoice_report/i18n/ro.po @@ -192,7 +192,7 @@ msgstr "Linie extras bacă" #. module: l10n_ro_invoice_report #: model_terms:ir.ui.view,arch_db:l10n_ro_invoice_report.l10n_ro_report_invoice_document msgid "Cancelled" -msgstr "anulată" +msgstr "Anulată" #. module: l10n_ro_invoice_report #: model:ir.actions.report,name:l10n_ro_invoice_report.action_report_statement_collection @@ -251,7 +251,7 @@ msgid "" " subsequent amendments." msgstr "" "Factură valabilă fără semnatură şi ştampilă cf. art.V, alin (2) din " -"Ordonanţa nr.17/2015, art. 319 alin (29) dinLegea nr. 227/2015 privind Codul" +"Ordonanța nr.17/2015, art. 319 alin (29) dinLegea nr. 227/2015 privind Codul" " fiscal și modificările ulterioare." #. module: l10n_ro_invoice_report @@ -395,6 +395,3 @@ msgstr "de la" #, python-format msgid "Credit Note" msgstr "Factura ștorno" - - - diff --git a/l10n_ro_invoice_report/models/account_invoice.py b/l10n_ro_invoice_report/models/account_invoice.py index fbbffd8e..68a0d23f 100644 --- a/l10n_ro_invoice_report/models/account_invoice.py +++ b/l10n_ro_invoice_report/models/account_invoice.py @@ -80,6 +80,13 @@ def _get_reconciled_vals(self, partial, amount, counterpart_line): ) return values + def _get_reconciled_info_JSON_values(self): + reconciled_vals = super(AccountInvoice, self)._get_reconciled_info_JSON_values() + for reconciled_val in reconciled_vals: + payment = self.env["account.payment"].browse(reconciled_val["account_payment_id"]) + reconciled_val["journal_type"] = payment.journal_id.type + return reconciled_vals + # # class account_invoice_line(models.Model): diff --git a/l10n_ro_invoice_report/views/invoice_report.xml b/l10n_ro_invoice_report/views/invoice_report.xml index 21e9ac31..1ba6423b 100644 --- a/l10n_ro_invoice_report/views/invoice_report.xml +++ b/l10n_ro_invoice_report/views/invoice_report.xml @@ -355,13 +355,13 @@ -
- - +
+
+ - + +
Elaborate: Information for delivery:
Name: @@ -381,6 +381,7 @@
@@ -414,9 +415,7 @@

-
-
diff --git a/l10n_ro_invoice_report/views/res_partner_view.xml b/l10n_ro_invoice_report/views/res_partner_view.xml new file mode 100644 index 00000000..705772ec --- /dev/null +++ b/l10n_ro_invoice_report/views/res_partner_view.xml @@ -0,0 +1,15 @@ + + + + + res.partner.form + res.partner + + + + + + + + +