thirdparty
/
CybroAddons
mirror of https://github.com/CybroOdoo/CybroAddons.git
5
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Apr 03: [FIX] Bug Fixed 'invoice_format_editor'

pull/164/merge
RisvanaCybro 1 year ago
parent
487623c2e6
commit
76f9661688
5 changed files with 84 additions and 143 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      invoice_format_editor/__manifest__.py
  2. 5
      invoice_format_editor/doc/RELEASE_NOTES.md
  3. 88
      invoice_format_editor/reports/custom_invoice_template.xml
  4. 67
      invoice_format_editor/reports/custom_invoice_template_fantacy.xml
  5. 65
      invoice_format_editor/reports/custom_invoice_template_old_standard.xml

2
invoice_format_editor/__manifest__.py
View File

@ -22,7 +22,7 @@
{ {
'name': 'Invoice Format Editor', 'name': 'Invoice Format Editor',
'version': '14.0.2.2.', 'version': '14.0.2.3.',
'category': 'Accounting', 'category': 'Accounting',
'summary': 'Invoice Format Editor', 'summary': 'Invoice Format Editor',
'description': """Invoice Format Editor For Configuring the Invoice Templates""", 'description': """Invoice Format Editor For Configuring the Invoice Templates""",

5
invoice_format_editor/doc/RELEASE_NOTES.md
View File

@ -9,3 +9,8 @@
#### UPDT AND BUGFIX #### UPDT AND BUGFIX
- Invoice printing issue - Invoice printing issue
#### 03.04.2024
#### Version 14.0.2.3.
##### UPDATE
- Bug Fix-Resolved the attribute error, updated the report templates

88
invoice_format_editor/reports/custom_invoice_template.xml
View File

@ -102,28 +102,8 @@
<tr> <tr>
<td> <td>
<span style="color:#{o.theme_id.customer_text_color} !important;" <span style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id"/> t-field="o.partner_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
<br/> <br/>
<span t-if="o.theme_id.address">
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.street"/>
<br/>
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.street2"/>
<br/>
</span>
<span t-if="o.theme_id.city">
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.city"/>
<br/>
</span>
<span t-if="o.theme_id.country">
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.country_id"/>
<br/>
</span>
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;" <span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.vat"/> t-field="o.partner_id.vat"/>
<br/> <br/>
@ -354,53 +334,27 @@
</div> </div>
</div> </div>
<div style="padding-top:10%;" class="col-12"> <div style="padding-top:10%;" class="col-12">
<p t-if="o.narration"> <p t-if="o.move_type in ('out_invoice', 'in_refund') and o.payment_reference" name="payment_communication">
<strong>Comment:</strong> Please use the following communication for your payment : <b><span t-field="o.payment_reference"/></b>
<span t-field="o.narration"/> </p>
</p> <p t-if="o.invoice_payment_term_id" name="payment_term">
<p t-if="o.fiscal_position_id.note"> <span t-field="o.invoice_payment_term_id.note"/>
<strong>Fiscal Position Remark:</strong> </p>
<span t-field="o.fiscal_position_id.note"/> <p t-if="o.narration" name="comment">
</p> <span t-field="o.narration"/>
<br/> </p>
<br/> <p t-if="o.fiscal_position_id.note" name="note">
<p t-if="o.move_type in ('out_invoice','in_refund')"> <span t-field="o.fiscal_position_id.note"/>
Please use the following communication for your </p>
payment : <p t-if="o.invoice_incoterm_id" name="incoterm">
<b> <strong>Incoterm: </strong><span t-field="o.invoice_incoterm_id.code"/> - <span t-field="o.invoice_incoterm_id.name"/>
<span t-field="o.payment_reference"/> </p>
</b> <div id="qrcode" t-if="o.display_qr_code and o.amount_residual > 0">
</p> <p t-if="qr_code_urls.get(o.id)">
<p t-if="o.invoice_payment_term_id" name="payment_term"> <strong class="text-center">Scan me with your banking app.</strong><br/><br/>
<span t-field="o.invoice_payment_term_id.note"/> <img class="border border-dark rounded" t-att-src="qr_code_urls[o.id]"/>
</p>
<p t-if="o.fiscal_position_id.note" name="note">
<span t-field="o.fiscal_position_id.note"/>
</p> </p>
<t t-if="o.company_id.country_id.code == 'IN'"> </div>
<p id="total_in_words" class="mb16">
<strong>Total (In Words):</strong>
<span t-field="o.amount_total_words"/>
</p>
</t>
<div id="qrcode"
t-if="(o.company_id.qr_code) and (o.currency_id.name == 'EUR') and (o.invoice_partner_bank_id.acc_number != False)">
<p t-if="(o.invoice_partner_bank_id.qr_code_valid)">
<strong class="text-center">Scan me with your
banking app.
</strong>
<br/>
<br/>
<img class="border border-dark rounded"
t-att-src="o.invoice_partner_bank_id.build_qr_code_url(o.amount_residual, o.ref or o.name)"/>
</p>
<p t-if="(o.invoice_partner_bank_id.qr_code_valid == False)">
<strong class="text-center">The SEPA QR Code
informations are not set correctly.
</strong>
<br/>
</p>
</div>
</div> </div>
</div> </div>
</t> </t>

67
invoice_format_editor/reports/custom_invoice_template_fantacy.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <odoo>
<data> <data>
<!--modern Template View--> <!--modern Template View-->
<template id="custom_template_report_invoice_modern"> <template id="custom_template_report_invoice_modern">
<t t-if="o and 'company_id' in o"> <t t-if="o and 'company_id' in o">
<t t-set="company" t-value="o.company_id"/> <t t-set="company" t-value="o.company_id"/>
@ -130,26 +130,8 @@
<strong>Customer Address</strong> <strong>Customer Address</strong>
<br/> <br/>
<span style="color:#{o.theme_id.customer_text_color} !important;" <span style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id"/> t-field="o.partner_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
<br/> <br/>
<span t-if="o.theme_id.address">
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.street"/>
<br/>
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.street2"/>
<br/>
</span>
<span t-if="o.theme_id.city">
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.city"/>
</span>
<br/>
<span t-if="o.theme_id.country">
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.country_id"/>
</span>
<br/>
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;" <span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.vat"/> t-field="o.partner_id.vat"/>
<br/> <br/>
@ -287,20 +269,10 @@
</div> </div>
</div> </div>
<div style="padding-top:10%;" class="col-12"> <div style="padding-top:10%;" class="col-12">
<p t-if="o.narration"> <p t-if="o.move_type in ('out_invoice', 'in_refund') and o.payment_reference"
<strong>Comment:</strong> name="payment_communication">
<span t-field="o.narration"/>
</p>
<p t-if="o.fiscal_position_id.note">
<strong>Fiscal Position Remark:</strong>
<span t-field="o.fiscal_position_id.note"/>
</p>
<br/>
<br/>
<p t-if="o.move_type in ('out_invoice','in_refund')">
Please use the following communication for your Please use the following communication for your
payment payment :
:
<b> <b>
<span t-field="o.payment_reference"/> <span t-field="o.payment_reference"/>
</b> </b>
@ -308,34 +280,31 @@
<p t-if="o.invoice_payment_term_id" name="payment_term"> <p t-if="o.invoice_payment_term_id" name="payment_term">
<span t-field="o.invoice_payment_term_id.note"/> <span t-field="o.invoice_payment_term_id.note"/>
</p> </p>
<p t-if="o.narration" name="comment">
<span t-field="o.narration"/>
</p>
<p t-if="o.fiscal_position_id.note" name="note"> <p t-if="o.fiscal_position_id.note" name="note">
<span t-field="o.fiscal_position_id.note"/> <span t-field="o.fiscal_position_id.note"/>
</p> </p>
<t t-if="o.company_id.country_id.code == 'IN'"> <p t-if="o.invoice_incoterm_id" name="incoterm">
<p id="total_in_words" class="mb16"> <strong>Incoterm:</strong>
<strong>Total (In Words):</strong> <span t-field="o.invoice_incoterm_id.code"/>
<span t-field="o.amount_total_words"/> -
</p> <span t-field="o.invoice_incoterm_id.name"/>
</t> </p>
<div id="qrcode" <div id="qrcode"
t-if="(o.company_id.qr_code) and (o.currency_id.name == 'EUR') and (o.invoice_partner_bank_id.acc_number != False)"> t-if="o.display_qr_code and o.amount_residual > 0">
<p t-if="(o.invoice_partner_bank_id.qr_code_valid)"> <p t-if="qr_code_urls.get(o.id)">
<strong class="text-center">Scan me with your <strong class="text-center">Scan me with your
banking app. banking app.
</strong> </strong>
<br/> <br/>
<br/> <br/>
<img class="border border-dark rounded" <img class="border border-dark rounded"
t-att-src="o.invoice_partner_bank_id.build_qr_code_url(o.amount_residual, o.ref or o.name)"/> t-att-src="qr_code_urls[o.id]"/>
</p>
<p t-if="(o.invoice_partner_bank_id.qr_code_valid == False)">
<strong class="text-center">The SEPA QR Code
informations are not set
correctly.
</strong>
<br/>
</p> </p>
</div> </div>
</div> </div>
</div> </div>
</t> </t>

65
invoice_format_editor/reports/custom_invoice_template_old_standard.xml
View File

@ -41,28 +41,7 @@
<div t-attf-class=" pull-#{o.theme_id.customer_position} text-#{o.theme_id.customer_position}" <div t-attf-class=" pull-#{o.theme_id.customer_position} text-#{o.theme_id.customer_position}"
style="font:15px lucida-console,sans-serif !important;"> style="font:15px lucida-console,sans-serif !important;">
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;" <span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id"/> t-field="o.partner_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
<br/>
<span t-if="o.theme_id.address">
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.street"/>
<br/>
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.street2"/>
</span>
<br/>
<span t-if="o.theme_id.city">
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.city"/>
</span>
<br/>
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.state_id"/>
<br/>
<span t-if="o.theme_id.country">
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.country_id"/>
</span>
<br/> <br/>
<span t-attf-style="color:#{o.theme_id.customer_text_color} !important;" <span t-attf-style="color:#{o.theme_id.customer_text_color} !important;"
t-field="o.partner_id.vat"/> t-field="o.partner_id.vat"/>
@ -258,10 +237,44 @@
</div> </div>
</div> </div>
<br/> <br/>
<br/> <div style="padding-top:10%;" class="col-12">
<br/> <p t-if="o.move_type in ('out_invoice', 'in_refund') and o.payment_reference"
<br/> name="payment_communication">
<br/> Please use the following communication for your
payment :
<b>
<span t-field="o.payment_reference"/>
</b>
</p>
<p t-if="o.invoice_payment_term_id" name="payment_term">
<span t-field="o.invoice_payment_term_id.note"/>
</p>
<p t-if="o.narration" name="comment">
<span t-field="o.narration"/>
</p>
<p t-if="o.fiscal_position_id.note" name="note">
<span t-field="o.fiscal_position_id.note"/>
</p>
<p t-if="o.invoice_incoterm_id" name="incoterm">
<strong>Incoterm:</strong>
<span t-field="o.invoice_incoterm_id.code"/>
-
<span t-field="o.invoice_incoterm_id.name"/>
</p>
<div id="qrcode"
t-if="o.display_qr_code and o.amount_residual > 0">
<p t-if="qr_code_urls.get(o.id)">
<strong class="text-center">Scan me with your
banking app.
</strong>
<br/>
<br/>
<img class="border border-dark rounded"
t-att-src="qr_code_urls[o.id]"/>
</p>
</div>
</div>
</div> </div>
</t> </t>
</template> </template>

Write Preview
Loading…
Cancel
Save