Merge pull request #527 from expsa/pla-487154-fix-letters-report
fix letters report
This commit is contained in:
Moutaz Muhammad
GitHub
commit
18b97b3ca3
|
|
@ -6,43 +6,65 @@
|
|||
<div class="header">
|
||||
<div class="row">
|
||||
<br/>
|
||||
<table align="left" style="border:1px solid white;width:50;margin-left:60px;margin-top:0px;margin-right:5px;margin-bottom:40px;text-align: justify;">
|
||||
<tr style="border:0px">
|
||||
<td style="font-weight: bold;border:0px;padding-right:30px !important;">Number:
|
||||
<t t-esc="o.incoming_transaction_id.name"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;"><span style="font-weight:bold;font-stretch: expanded;">
|
||||
Date:</span>
|
||||
<div class="col-6 text-right">
|
||||
<table align="left"
|
||||
style="border:1px solid white;width:50;margin-left:60px;margin-top:0px;margin-right:5px;margin-bottom:40px;text-align: justify;">
|
||||
<tr style="border:0px">
|
||||
<td style="font-weight: bold;border:0px;padding-right:30px !important;">Number:
|
||||
<t t-esc="o.incoming_transaction_id.name"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;">
|
||||
<span style="font-weight:bold;font-stretch: expanded;">
|
||||
Date:
|
||||
</span>
|
||||
|
||||
<t t-set="date_hijri" t-value="o.incoming_transaction_id.transaction_date_hijri"/>
|
||||
<t t-set="date_hijri"
|
||||
t-value="o.incoming_transaction_id.transaction_date_hijri"/>
|
||||
|
||||
<t t-set="date_hijri2" t-value="date_hijri.split('-')"/>
|
||||
<t t-set="date_hijri2" t-value="date_hijri.split('-')"/>
|
||||
|
||||
<t t-esc="date_hijri2[0]"/>/<t t-esc="date_hijri2[1]"/>/<t t-esc="date_hijri2[2]"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;"><span style="font-weight:bold;">Reference:</span>
|
||||
<span t-field="o.incoming_transaction_id.transaction_date" t-field-options='{"format": "yyyy/MM/dd"}'/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;">
|
||||
<span style="font-weight:bold">Attachment:</span>
|
||||
<span style="direction: ltr !important;">
|
||||
<t t-esc="o.incoming_transaction_id.attachment_num"/>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px">
|
||||
<img t-att-src="'/report/barcode/?type=%s&value=%s&width=%s&height=%s' % ('Code128', o.incoming_transaction_id.name, 600, 100)"
|
||||
style="width:250px;height:40px;margin-top:5px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<t t-esc="date_hijri2[0]"/>/<t t-esc="date_hijri2[1]"/>/
|
||||
<t t-esc="date_hijri2[2]"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;">
|
||||
<span style="font-weight:bold;">Reference:</span>
|
||||
<span t-field="o.incoming_transaction_id.transaction_date"
|
||||
t-field-options='{"format": "yyyy/MM/dd"}'/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;">
|
||||
<span style="font-weight:bold">Attachment:</span>
|
||||
<span style="direction: ltr !important;">
|
||||
<t t-esc="o.incoming_transaction_id.attachment_num"/>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px">
|
||||
<img t-att-src="'/report/barcode/?type=%s&value=%s&width=%`s&height=%s' % ('Code128', o.incoming_transaction_id.name, 600, 100)"
|
||||
style="width:250px;height:40px;margin-top:5px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
<div class="col-6 text-left">
|
||||
<table align="left">
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px">
|
||||
<img t-att-src="'/logo.png?company=%s' % (o.env.user.company_id.id or 0)"
|
||||
t-att-alt="'%s' % company.name"
|
||||
style="width:80px;height:80px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
|
|
@ -50,43 +72,63 @@
|
|||
<div class="header">
|
||||
<div class="row">
|
||||
<br/>
|
||||
<table align="left" style="border:1px solid white;width:50;margin-left:60px;margin-top:0px;margin-right:5px;margin-bottom:40px;text-align: justify;">
|
||||
<tr style="border:0px">
|
||||
<td style="font-weight: bold;border:0px;padding-right:30px !important;">Number:
|
||||
<t t-esc="o.internal_transaction_id.name"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;"><span style="font-weight:bold;font-stretch: expanded;">
|
||||
Date:</span>
|
||||
<div class="col-6 text-right">
|
||||
<table align="left"
|
||||
style="border:1px solid white;width:50;margin-left:60px;margin-top:0px;margin-right:5px;margin-bottom:40px;text-align: justify;">
|
||||
<tr style="border:0px">
|
||||
<td style="font-weight: bold;border:0px;padding-right:30px !important;">Number:
|
||||
<t t-esc="o.internal_transaction_id.name"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;">
|
||||
<span style="font-weight:bold;font-stretch: expanded;">
|
||||
Date:
|
||||
</span>
|
||||
|
||||
<t t-set="date_hijri" t-value="o.internal_transaction_id.transaction_date_hijri"/>
|
||||
<t t-set="date_hijri"
|
||||
t-value="o.internal_transaction_id.transaction_date_hijri"/>
|
||||
|
||||
<t t-set="date_hijri2" t-value="date_hijri.split('-')"/>
|
||||
<t t-set="date_hijri2" t-value="date_hijri.split('-')"/>
|
||||
|
||||
<t t-esc="date_hijri2[0]"/>/<t t-esc="date_hijri2[1]"/>/<t t-esc="date_hijri2[2]"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;"><span style="font-weight:bold;">Reference:</span>
|
||||
<span t-field="o.internal_transaction_id.transaction_date" t-field-options='{"format": "yyyy/MM/dd"}'/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;">
|
||||
<span style="font-weight:bold">Attachment:</span>
|
||||
<span style="direction: ltr !important;">
|
||||
<t t-esc="o.internal_transaction_id.attachment_num"/>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px">
|
||||
<img t-att-src="'/report/barcode/?type=%s&value=%s&width=%s&height=%s' % ('Code128', o.internal_transaction_id.name, 600, 100)"
|
||||
style="width:250px;height:40px;margin-top:5px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<t t-esc="date_hijri2[0]"/>/<t t-esc="date_hijri2[1]"/>/
|
||||
<t t-esc="date_hijri2[2]"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;">
|
||||
<span style="font-weight:bold;">Reference:</span>
|
||||
<span t-field="o.internal_transaction_id.transaction_date"
|
||||
t-field-options='{"format": "yyyy/MM/dd"}'/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;">
|
||||
<span style="font-weight:bold">Attachment:</span>
|
||||
<span style="direction: ltr !important;">
|
||||
<t t-esc="o.internal_transaction_id.attachment_num"/>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px">
|
||||
<img t-att-src="'/report/barcode/?type=%s&value=%s&width=%s&height=%s' % ('Code128', o.internal_transaction_id.name, 600, 100)"
|
||||
style="width:250px;height:40px;margin-top:5px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-6 text-left">
|
||||
<table align="left">
|
||||
<tr style="border:0px">
|
||||
<td >
|
||||
<img t-att-src="'/logo.png?company=%s' % (o.env.user.company_id.id or 0)"
|
||||
t-att-alt="'%s' % company.name"
|
||||
style="width:80px;height:80px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
|
|
@ -95,43 +137,63 @@
|
|||
<div class="header">
|
||||
<div class="row">
|
||||
<br/>
|
||||
<table align="left" style="border:1px solid white;width:50;margin-left:60px;margin-top:0px;margin-right:5px;margin-bottom:40px;text-align: justify;">
|
||||
<tr style="border:0px">
|
||||
<td style="font-weight: bold;border:0px;padding-right:30px !important;">Number:
|
||||
<t t-esc="o.outgoing_transaction_id.name"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;"><span style="font-weight:bold;font-stretch: expanded;">
|
||||
Date:</span>
|
||||
<div class="col-6 text-right">
|
||||
<table align="left"
|
||||
style="border:1px solid white;width:50;margin-left:60px;margin-top:0px;margin-right:5px;margin-bottom:40px;text-align: justify;">
|
||||
<tr style="border:0px">
|
||||
<td style="font-weight: bold;border:0px;padding-right:30px !important;">Number:
|
||||
<t t-esc="o.outgoing_transaction_id.name"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;">
|
||||
<span style="font-weight:bold;font-stretch: expanded;">
|
||||
Date:
|
||||
</span>
|
||||
|
||||
<t t-set="date_hijri" t-value="o.outgoing_transaction_id.transaction_date_hijri"/>
|
||||
<t t-set="date_hijri"
|
||||
t-value="o.outgoing_transaction_id.transaction_date_hijri"/>
|
||||
|
||||
<t t-set="date_hijri2" t-value="date_hijri.split('-')"/>
|
||||
<t t-set="date_hijri2" t-value="date_hijri.split('-')"/>
|
||||
|
||||
<t t-esc="date_hijri2[0]"/>/<t t-esc="date_hijri2[1]"/>/<t t-esc="date_hijri2[2]"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;"><span style="font-weight:bold;">Reference:</span>
|
||||
<span t-field="o.outgoing_transaction_id.transaction_date" t-field-options='{"format": "yyyy/MM/dd"}'/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;">
|
||||
<span style="font-weight:bold">Attachment:</span>
|
||||
<span style="direction: ltr !important;">
|
||||
<t t-esc="o.outgoing_transaction_id.attachment_num"/>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px">
|
||||
<img t-att-src="'/report/barcode/?type=%s&value=%s&width=%s&height=%s' % ('Code128', o.outgoing_transaction_id.name, 600, 100)"
|
||||
style="width:250px;height:40px;margin-top:5px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<t t-esc="date_hijri2[0]"/>/<t t-esc="date_hijri2[1]"/>/
|
||||
<t t-esc="date_hijri2[2]"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;">
|
||||
<span style="font-weight:bold;">Reference:</span>
|
||||
<span t-field="o.outgoing_transaction_id.transaction_date"
|
||||
t-field-options='{"format": "yyyy/MM/dd"}'/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="border:0px;padding-right:30px !important;">
|
||||
<span style="font-weight:bold">Attachment:</span>
|
||||
<span style="direction: ltr !important;">
|
||||
<t t-esc="o.outgoing_transaction_id.attachment_num"/>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px">
|
||||
<img t-att-src="'/report/barcode/?type=%s&value=%s&width=%s&height=%s' % ('Code128', o.outgoing_transaction_id.name, 600, 100)"
|
||||
style="width:250px;height:40px;margin-top:5px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-6 text-left">
|
||||
<table align="left">
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px">
|
||||
<img t-att-src="'/logo.png?company=%s' % (o.env.user.company_id.id or 0)"
|
||||
t-att-alt="'%s' % company.name"
|
||||
style="width:80px;height:80px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
|
|
@ -139,7 +201,20 @@
|
|||
<t t-if="o.outgoing_transaction_id =='' and o.internal_transaction_id=='' and o.incoming_transaction_id ==''">
|
||||
<div class="header">
|
||||
<div class="row">
|
||||
<div class="col-6 text-right">
|
||||
|
||||
</div>
|
||||
<div class="col-6 text-left">
|
||||
<table align="left">
|
||||
<tr style="border:0px">
|
||||
<td colspan="2" style="border:0px">
|
||||
<img t-att-src="'/logo.png?company=%s' % (o.env.user.company_id.id or 0)"
|
||||
t-att-alt="'%s' % company.name"
|
||||
style="width:80px;height:80px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
|
|
@ -150,7 +225,10 @@
|
|||
<div class="footer">
|
||||
<div class="text-center">
|
||||
<div class="text-muted">
|
||||
Page: <span class="page"/> / <span class="topage"/>
|
||||
Page:
|
||||
<span class="page"/>
|
||||
/
|
||||
<span class="topage"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -168,7 +246,9 @@
|
|||
<t t-if="not o or not 'company_id' in o">
|
||||
<t t-set="company" t-value="res_company"/>
|
||||
</t>
|
||||
<t t-call="exp_transation_letters.custom_external_layout_standard"><t t-raw="0"/></t>
|
||||
<t t-call="exp_transation_letters.custom_external_layout_standard">
|
||||
<t t-raw="0"/>
|
||||
</t>
|
||||
<!-- <t t-if="company.external_report_layout_id == 'background'">
|
||||
<t t-call="exp_transation_letters.custom_external_layout_standard"><t t-raw="0"/></t>
|
||||
</t>
|
||||
|
|
@ -187,9 +267,9 @@
|
|||
<t t-foreach="docs" t-as="o">
|
||||
<t t-call="exp_transation_letters.letter_external_layout">
|
||||
<div class="page">
|
||||
<!-- <h4 style="text-align:center;margin-top:20px;font-weight:bold;font-size:20pt">Letter <t t-esc="o.name"/>-->
|
||||
<!-- </h4>-->
|
||||
<!-- <strong style="margin: 10px;margin-left:30px"> Date </strong>: <span t-esc="o.date" />-->
|
||||
<!-- <h4 style="text-align:center;margin-top:20px;font-weight:bold;font-size:20pt">Letter <t t-esc="o.name"/>-->
|
||||
<!-- </h4>-->
|
||||
<!-- <strong style="margin: 10px;margin-left:30px"> Date </strong>: <span t-esc="o.date" />-->
|
||||
<br/>
|
||||
<br/>
|
||||
<div style="margin-bottom: 0px">
|
||||
|
|
@ -199,7 +279,8 @@
|
|||
<br/>
|
||||
<br/>
|
||||
<div style="margin-top: 0px;" dir="ltr">
|
||||
<img t-if="o.signature" t-attf-src="data:image/*;base64,{{o.signature}}" style="margin-top:50px;height:100px;width:100px; border: 0px;margin-left:25px"/>
|
||||
<img t-if="o.signature" t-attf-src="data:image/*;base64,{{o.signature}}"
|
||||
style="margin-top:50px;height:100px;width:100px; border: 0px;margin-left:25px"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue