Merge pull request #1341 from expsa/dev_odex25_transactions

Dev odex25 transactions
This commit is contained in:
zainab2097 2024-09-30 12:57:56 +03:00 committed by GitHub
commit 23241baac2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 49 additions and 46 deletions

View File

@ -6,52 +6,56 @@
<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.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-2" style="color:white;">zainB</div>
<div class="col-10">
<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.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.transaction_date_hijri"/>
<t t-set="date_hijri" t-value="o.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.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.attachment_num"/>
</span>
</td>
</tr>
<tr style="border:0px">
<td colspan="2" style="border:0px">
<img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.name, 600, 100)"
style="width:250px;height:40px;margin-top:5px;"/>
</td>
</tr>
</table>
</div>
<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.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.attachment_num"/>
</span>
</td>
</tr>
<tr style="border:0px">
<td colspan="2" style="border:0px">
<img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.name, 600, 100)"
style="width:250px;height:40px;margin-top:5px;"/>
</td>
</tr>
</table>
</div>
</div>
<br></br>
</xpath>
</template>
</data>
</odoo>
</odoo>

View File

@ -136,15 +136,13 @@
<field name="default" eval="True"/>
<field name="format">A4</field>
<field name="orientation">Portrait</field>
<field name="margin_top">90</field>
<field name="margin_top">59</field>
<field name="margin_right">10</field>
<field name="margin_bottom">50</field>
<field name="margin_bottom">30</field>
<field name="margin_left">10</field>
<field name="header_line" eval="False"/>
<field name="header_spacing">35</field>
<!-- <field name="dpi">90</field> -->
<field name="dpi">120</field> <!-- Try lowering or raising this for testing -->
<field name="dpi">90</field>
</record>
<report id="report_internal_transaction_receive_report"

View File

@ -3,7 +3,8 @@
<data>
<template id="custom_external_layout_standard_tran">
<div class="header">
<div class="header" stylle="background-color:blue;">
</div>
<div class="article o_report_layout_standard">
<t t-raw="0"/>