mirror of
https://gitlab.com/sonalarora/tra_backend.git
synced 2025-12-17 10:19:09 +02:00
work on delivery report
This commit is contained in:
@@ -20,9 +20,9 @@
|
||||
"res_company.xml",
|
||||
|
||||
"invoice_report/fency_report_account.xml",
|
||||
"invoice_report/fency_report_invoice.xml",
|
||||
"invoice_report/report_invoice_classic.xml",
|
||||
"invoice_report/report_invoice_modern.xml",
|
||||
"invoice_report/fency_report_invoice.xml",
|
||||
"invoice_report/report_invoice_classic.xml",
|
||||
"invoice_report/report_invoice_modern.xml",
|
||||
"invoice_report/report_invoice_odoo_standard.xml",
|
||||
|
||||
"delivery_report/stock_report_classic.xml",
|
||||
|
||||
@@ -185,18 +185,17 @@
|
||||
groups="stock.group_production_lot"/>
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="background-color:#3498DB !important;color:#FFF !important;">No</th>
|
||||
<th style="background-color:#3498DB !important;color:#FFF !important;">W/H</th>
|
||||
<th style="background-color:#3498DB !important;color:#FFF !important;">Code</th>
|
||||
<th style="background-color:#3498DB !important;color:#FFF !important;">Product</th>
|
||||
<th style="background-color:#3498DB !important;color:#FFF !important;" name="lot_serial"
|
||||
<th colspan="2" style="background-color:#3498DB !important;color:#FFF !important;">No</th>
|
||||
<th colspan="2" style="background-color:#3498DB !important;color:#FFF !important;">W/H</th>
|
||||
<th colspan="2" style="background-color:#3498DB !important;color:#FFF !important;">Code</th>
|
||||
<th colspan="3" style="background-color:#3498DB !important;color:#FFF !important;">Product</th>
|
||||
<th colspan="2" style="background-color:#3498DB !important;color:#FFF !important;" name="lot_serial"
|
||||
t-if="has_serial_number">
|
||||
Lot/Serial Number
|
||||
</th>
|
||||
<th style="background-color:#3498DB !important;color:#FFF !important;">Ordered
|
||||
Quantity
|
||||
<th colspan="2" style="background-color:#3498DB !important;color:#FFF !important;">Ordered Quantity
|
||||
</th>
|
||||
<th t-if="any([move_line.state == 'done' for move_line in o.move_line_ids])"
|
||||
<th colspan="2" t-if="any([move_line.state == 'done' for move_line in o.move_line_ids])"
|
||||
style="background-color:#3498DB !important;color:#FFF !important;">
|
||||
Delivered Quantity
|
||||
</th>
|
||||
@@ -204,15 +203,15 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr t-foreach="o.move_line_ids" t-as="move_line">
|
||||
<td>
|
||||
<td colspan="2">
|
||||
<!--<t t-esc="move_line+1"></t>-->
|
||||
</td>
|
||||
<td>
|
||||
<td colspan="2">
|
||||
</td>
|
||||
<td>
|
||||
<td colspan="2">
|
||||
<span t-field="move_line.product_id.default_code"/>
|
||||
</td>
|
||||
<td>
|
||||
<td colspan="3">
|
||||
<span t-field="move_line.product_id"/>
|
||||
<p t-if="o.picking_type_code == 'outgoing'">
|
||||
<span t-field="move_line.product_id.description_pickingout"/>
|
||||
@@ -243,13 +242,13 @@
|
||||
</table>
|
||||
</td>
|
||||
</t>
|
||||
<td class="text-center">
|
||||
<td colspan="2" class="text-center">
|
||||
<span t-field="move_line.package_id"/>
|
||||
<span t-if="move_line.package_id">:</span>
|
||||
<span t-field="move_line.product_qty"/>
|
||||
<span t-field="move_line.product_uom_id"/>
|
||||
</td>
|
||||
<td class="text-right" t-if="move_line.state == 'done'">
|
||||
<td colspan="2" class="text-right" t-if="move_line.state == 'done'">
|
||||
<t t-if="move_line.product_qty != move_line.qty_done">
|
||||
<t t-set="backorder" t-value="True"/>
|
||||
</t>
|
||||
@@ -258,18 +257,18 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr rowspan="2">
|
||||
<td colspan="3">Transport</td>
|
||||
<td colspan="6">Transport</td>
|
||||
<td colspan="3">Material Received by</td>
|
||||
<td colspan="3">Deleivery Given by</td>
|
||||
<td colspan="2">Deleivery Given by</td>
|
||||
</tr>
|
||||
<tr rowspan="2">
|
||||
<td colspan="2">Deriver's Name</td>
|
||||
<td colspan="2">Signature</td>
|
||||
<td colspan="6">Deriver's Name</td>
|
||||
<td colspan="3">Signature</td>
|
||||
<td colspan="2">Signature</td>
|
||||
</tr>
|
||||
<tr rowspan="2">
|
||||
<td colspan="2">Truck No.</td>
|
||||
<td colspan="2">Date</td>
|
||||
<td colspan="6">Truck No.</td>
|
||||
<td colspan="3">Date</td>
|
||||
<td colspan="2">Date</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@@ -10,7 +10,10 @@
|
||||
</t>
|
||||
<div class="header">
|
||||
<div class="row mt32 mb32">
|
||||
<div class="col-6">
|
||||
<div class="col-12">
|
||||
<font color="#fff"><img t-att-src="'data:image/png;base64,%s' % to_text(company.logo)" style="max-height: 250px;"/></font>
|
||||
</div>
|
||||
<!-- <div class="col-6">
|
||||
<img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % to_text(company.logo)"
|
||||
style="max-height: 50px;"/>
|
||||
</div>
|
||||
@@ -28,7 +31,7 @@
|
||||
<span t-field="company.partner_id.vat"/>
|
||||
<br/>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
|
||||
<t t-call="web.external_layout">
|
||||
@@ -134,8 +137,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="background-color:#893b74 !important;color:#FFF !important;">Product</th>
|
||||
<th style="background-color:#893b74 !important;color:#FFF !important;">Ordered
|
||||
Quantity
|
||||
<th style="background-color:#893b74 !important;color:#FFF !important;">Ordered Quantity
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
Reference in New Issue
Block a user