Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
dhongu committed Nov 21, 2023
1 parent aeb7e87 commit 9e4b1ba
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 11 deletions.
7 changes: 2 additions & 5 deletions l10n_ro_invoice_report/i18n/ro.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -395,6 +395,3 @@ msgstr "de la"
#, python-format
msgid "Credit Note"
msgstr "Factura ștorno"



7 changes: 7 additions & 0 deletions l10n_ro_invoice_report/models/account_invoice.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
11 changes: 5 additions & 6 deletions l10n_ro_invoice_report/views/invoice_report.xml
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,13 @@
</xpath>

<xpath expr="//div[@id='total']/div" position="replace">
<div class="col-7" t-if="o.move_type == 'out_invoice' or o.move_type == 'out_refund' ">
<table id="signature" class="table table-sm">
<tr class="border-black">
<div class="col-8" t-if="o.move_type == 'out_invoice' or o.move_type == 'out_refund' ">
<table id="signature" class="table table-sm" style="page-break-inside: avoid;">
<tr class="border-black" style="">
<td>Elaborate:</td>
<td>Information for delivery:</td>
</tr>
<tr class="border-black">
<tr class="border-black o_total">
<td>
<span>Name:</span>
<span t-field="o.user_id" />
Expand All @@ -381,6 +381,7 @@
</div>
</td>
</tr>
<tr/> <!-- empty row for white color-->
</table>
</div>
<div class="col-5">
Expand Down Expand Up @@ -414,9 +415,7 @@
<t t-set="payments_vals" t-value="o.sudo()._get_reconciled_info_JSON_values()" />
<br />
<br />

<div t-foreach="payments_vals" t-as="payment_vals" style="page-break-inside: avoid;">

<t t-if="payment_vals['journal_type']=='cash'">
<div>
<strong t-field="res_company.partner_id.name" />
Expand Down
15 changes: 15 additions & 0 deletions l10n_ro_invoice_report/views/res_partner_view.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" ?>
<odoo>
<data>
<record id="view_partner_property_form" model="ir.ui.view">
<field name="name">res.partner.form</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="account.view_partner_property_form" />
<field name="arch" type="xml">
<field name="property_account_payable_id" position="after">
<field name="info_for_invoice" />
</field>
</field>
</record>
</data>
</odoo>

0 comments on commit 9e4b1ba

Please sign in to comment.