Skip to content

Commit

Permalink
[IMP] delivery_tnt_oca: pre-comit
Browse files Browse the repository at this point in the history
  • Loading branch information
@RabbitJon-S73
RabbitJon-S73 committed Jun 22, 2023
1 parent 3f1bc2a commit e4ac7b6
Show file tree
Hide file tree
Showing 3 changed files with 160 additions and 90 deletions.
91 changes: 64 additions & 27 deletions delivery_tnt_oca/report/report_manifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<template id="report_tnt_manifest_document">
<div class="header">
<t t-set="pick" t-value="docs[0]"></t>
<t t-set="pick" t-value="docs[0]" />
<div class="row">
<div class="col-6">
<p class="mb-0"><strong>COLLECTION MANIFEST (SUMMARY)</strong></p>
<p class="mb-0"><span>Sender Account:</span> <span t-field="pick.carrier_id.tnt_oca_ws_account" /></p>
<p class="mb-0"><span>Sender Name:</span> <span t-field="pick.company_id.name"></span></p>
<p class="mb-0"><span>Address:</span> <span t-field="pick.company_id.street"></span></p>
<p class="mb-0"><span>Sender Account:</span> <span
t-field="pick.carrier_id.tnt_oca_ws_account"
/></p>
<p class="mb-0"><span>Sender Name:</span> <span
t-field="pick.company_id.name"
/></p>
<p class="mb-0"><span>Address:</span> <span
t-field="pick.company_id.street"
/></p>
</div>
<div class="col-3 pt-1">
<img src="/delivery_tnt_oca/static/src/img/black_logo.jpg" style="width: 90%;object-fit: contain;"/>
<img
src="/delivery_tnt_oca/static/src/img/black_logo.jpg"
style="width: 90%;object-fit: contain;"
/>
</div>
<div class="col-3">
<p class="mb-0"><span t-esc="context_timestamp(datetime.datetime.now()).strftime('%d/%m/%Y %H:%M')"/></p>
<p class="mb-0"><span
t-esc="context_timestamp(datetime.datetime.now()).strftime('%d/%m/%Y %H:%M')"
/></p>
<p class="mb-0">
<span>Page</span>
<span class="page"></span>
<span>of</span>
<span class="topage"></span>
<span class="topage" />
</p>
</div>
</div>
</div>
<div class="article">
<div class="page" style="font-family:'Gilroy Light', sans-serif;font-weight: lighter;font-size: 10pt">
<div
class="page"
style="font-family:'Gilroy Light', sans-serif;font-weight: lighter;font-size: 10pt"
>
<div class="row" style="padding:0">
<table class="table">
<thead>
<tr >
<tr>
<th>Con Nr</th>
<th>No of Pieces</th>
<th>Weight(kg)</th>
Expand All @@ -43,8 +57,8 @@
</tr>
</thead>
<tbody>
<t t-set="total_w" t-value="0.0"></t>
<t t-set="total_p" t-value="0"></t>
<t t-set="total_w" t-value="0.0" />
<t t-set="total_p" t-value="0" />
<t t-foreach="docs" t-as="doc">
<tr>
<td>
Expand Down Expand Up @@ -73,26 +87,37 @@
<span t-field="doc.partner_id.city" />
</td>
<td>
<span t-field="doc.partner_id.country_id.name" />
<span
t-field="doc.partner_id.country_id.name"
/>
</td>
<td>
<span t-field="doc.carrier_id.tnt_product_code_n" />
<span
t-field="doc.carrier_id.tnt_product_code_n"
/>
</td>
<t t-set="total_w" t-value="total_w + doc.weight" />
<t t-set="total_p" t-value="total_p + doc.number_of_packages" />
<t
t-set="total_p"
t-value="total_p + doc.number_of_packages"
/>
</tr>
</t>
</tbody>
</table>
</div>
<div class="row mt-3" style="border-bottom:1px solid black">
<div class="col-12">
<strong>Account</strong> <strong t-field="pick.carrier_id.tnt_oca_ws_account"></strong> <strong>Totals</strong>
<strong>Account</strong> <strong
t-field="pick.carrier_id.tnt_oca_ws_account"
/> <strong>Totals</strong>
</div>
</div>
<div class="row">
<div class="col-12">
<span t-esc="len(docs)"></span> <![CDATA[]]> <span t-esc="total_p"></span> <span t-esc="total_w"></span>
<span t-esc="len(docs)" /> <![CDATA[]]> <span
t-esc="total_p"
/> <span t-esc="total_w" />
</div>
</div>
<div class="row" style="border-bottom:1px solid black">
Expand All @@ -102,7 +127,9 @@
</div>
<div class="row">
<div class="col-12">
<span t-esc="len(docs)"></span> <span t-esc="total_p"></span> <span t-esc="total_w"></span>
<span t-esc="len(docs)" /> <span t-esc="total_p" /> <span
t-esc="total_w"
/>
</div>
</div>
<div class="row" style="border-bottom:1px solid black">
Expand All @@ -112,24 +139,34 @@
</div>
<div class="row">
<div class="col-12">
<span t-esc="len(docs)"></span> <span t-esc="total_p"></span> <span t-esc="total_w"></span>
<span t-esc="len(docs)" /> <span t-esc="total_p" /> <span
t-esc="total_w"
/>
</div>
</div>
<div class="row mt-5">
<div class="col-6">
<p class="mb-0"><strong>Sender's Signature______________________</strong></p>
<p class="mb-0 mt-5"><strong>Received by TNT_________________________</strong></p>
<p class="mb-0"><strong
>Sender's Signature______________________</strong></p>
<p class="mb-0 mt-5"><strong
>Received by TNT_________________________</strong></p>
</div>
<div class="col-6">
<p class="mb-0"><strong>Date</strong> <strong t-esc="datetime.date.today()" t-options="{'widget':'date','format':'dd/MM/yyyy'}"></strong></p>
<p class="mb-0 mt-5"><strong>Date: ____/____/____ Time: ____:____</strong></p>
<p class="mb-0"><strong>Date</strong> <strong
t-esc="datetime.date.today()"
t-options="{'widget':'date','format':'dd/MM/yyyy'}"
/></p>
<p class="mb-0 mt-5"><strong
>Date: ____/____/____ Time: ____:____</strong></p>
</div>
</div>
<div class="row mt-5 pt-5" style="border-bottom:1px solid black">
<span>The consignment(s) has been loaded by TNT or a designated agent of TNT and a check of the number and condition of the consignment(s) has been undertaken by TNT.</span>
<span
>The consignment(s) has been loaded by TNT or a designated agent of TNT and a check of the number and condition of the consignment(s) has been undertaken by TNT.</span>
</div>
<div class="row" style="border-bottom:1px solid black">
<span>TNT'S LIABILITY FOR LOSS, DAMAGE AND DELAY IS LIMITED BY THE CMR CONVENTION OR THE WARSAW CONVENTION WHICHEVER IS APPLICABLE. THE SENDER AGREES THAT
<span
>TNT'S LIABILITY FOR LOSS, DAMAGE AND DELAY IS LIMITED BY THE CMR CONVENTION OR THE WARSAW CONVENTION WHICHEVER IS APPLICABLE. THE SENDER AGREES THAT
THE GENERAL CONDITIONS, WHICH CAN BE VIEWED AT https://www.tnt.com/terms , ARE ACCEPTABLE AND GOVERN THIS CONTRACT. IF NO SERVICES OR BILLING OPTIONS ARE
SELECTED THE FASTEST AVAILABLE SERVICE WILL BE CHARGED TO THE SENDER.</span>
</div>
Expand All @@ -139,7 +176,7 @@
</template>
<template id="report_tnt_manifest">
<t t-call="web.html_container">
<t t-call="delivery_tnt_oca.report_tnt_manifest_document"/>
<t t-call="delivery_tnt_oca.report_tnt_manifest_document" />
</t>
</template>
</odoo>
</odoo>
Loading

0 comments on commit e4ac7b6

Please sign in to comment.