work on delivery report

This commit is contained in:
sonal arora
2020-09-14 14:49:26 +05:30
parent 94d311825a
commit c7ead99b96
3 changed files with 28 additions and 27 deletions

View File

@@ -20,9 +20,9 @@
"res_company.xml", "res_company.xml",
"invoice_report/fency_report_account.xml", "invoice_report/fency_report_account.xml",
"invoice_report/fency_report_invoice.xml", "invoice_report/fency_report_invoice.xml",
"invoice_report/report_invoice_classic.xml", "invoice_report/report_invoice_classic.xml",
"invoice_report/report_invoice_modern.xml", "invoice_report/report_invoice_modern.xml",
"invoice_report/report_invoice_odoo_standard.xml", "invoice_report/report_invoice_odoo_standard.xml",
"delivery_report/stock_report_classic.xml", "delivery_report/stock_report_classic.xml",

View File

@@ -185,18 +185,17 @@
groups="stock.group_production_lot"/> groups="stock.group_production_lot"/>
<thead> <thead>
<tr> <tr>
<th style="background-color:#3498DB !important;color:#FFF !important;">No</th> <th colspan="2" style="background-color:#3498DB !important;color:#FFF !important;">No</th>
<th style="background-color:#3498DB !important;color:#FFF !important;">W/H</th> <th colspan="2" style="background-color:#3498DB !important;color:#FFF !important;">W/H</th>
<th style="background-color:#3498DB !important;color:#FFF !important;">Code</th> <th colspan="2" style="background-color:#3498DB !important;color:#FFF !important;">Code</th>
<th style="background-color:#3498DB !important;color:#FFF !important;">Product</th> <th colspan="3" 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;" name="lot_serial"
t-if="has_serial_number"> t-if="has_serial_number">
Lot/Serial Number Lot/Serial Number
</th> </th>
<th style="background-color:#3498DB !important;color:#FFF !important;">Ordered <th colspan="2" style="background-color:#3498DB !important;color:#FFF !important;">Ordered Quantity
Quantity
</th> </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;"> style="background-color:#3498DB !important;color:#FFF !important;">
Delivered Quantity Delivered Quantity
</th> </th>
@@ -204,15 +203,15 @@
</thead> </thead>
<tbody> <tbody>
<tr t-foreach="o.move_line_ids" t-as="move_line"> <tr t-foreach="o.move_line_ids" t-as="move_line">
<td> <td colspan="2">
<!--<t t-esc="move_line+1"></t>--> <!--<t t-esc="move_line+1"></t>-->
</td> </td>
<td> <td colspan="2">
</td> </td>
<td> <td colspan="2">
<span t-field="move_line.product_id.default_code"/> <span t-field="move_line.product_id.default_code"/>
</td> </td>
<td> <td colspan="3">
<span t-field="move_line.product_id"/> <span t-field="move_line.product_id"/>
<p t-if="o.picking_type_code == 'outgoing'"> <p t-if="o.picking_type_code == 'outgoing'">
<span t-field="move_line.product_id.description_pickingout"/> <span t-field="move_line.product_id.description_pickingout"/>
@@ -243,13 +242,13 @@
</table> </table>
</td> </td>
</t> </t>
<td class="text-center"> <td colspan="2" class="text-center">
<span t-field="move_line.package_id"/> <span t-field="move_line.package_id"/>
<span t-if="move_line.package_id">:</span> <span t-if="move_line.package_id">:</span>
<span t-field="move_line.product_qty"/> <span t-field="move_line.product_qty"/>
<span t-field="move_line.product_uom_id"/> <span t-field="move_line.product_uom_id"/>
</td> </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-if="move_line.product_qty != move_line.qty_done">
<t t-set="backorder" t-value="True"/> <t t-set="backorder" t-value="True"/>
</t> </t>
@@ -258,18 +257,18 @@
</td> </td>
</tr> </tr>
<tr rowspan="2"> <tr rowspan="2">
<td colspan="3">Transport</td> <td colspan="6">Transport</td>
<td colspan="3">Material Received by</td> <td colspan="3">Material Received by</td>
<td colspan="3">Deleivery Given by</td> <td colspan="2">Deleivery Given by</td>
</tr> </tr>
<tr rowspan="2"> <tr rowspan="2">
<td colspan="2">Deriver's Name</td> <td colspan="6">Deriver's Name</td>
<td colspan="2">Signature</td> <td colspan="3">Signature</td>
<td colspan="2">Signature</td> <td colspan="2">Signature</td>
</tr> </tr>
<tr rowspan="2"> <tr rowspan="2">
<td colspan="2">Truck No.</td> <td colspan="6">Truck No.</td>
<td colspan="2">Date</td> <td colspan="3">Date</td>
<td colspan="2">Date</td> <td colspan="2">Date</td>
</tr> </tr>
</tbody> </tbody>

View File

@@ -10,7 +10,10 @@
</t> </t>
<div class="header"> <div class="header">
<div class="row mt32 mb32"> <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)" <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % to_text(company.logo)"
style="max-height: 50px;"/> style="max-height: 50px;"/>
</div> </div>
@@ -28,7 +31,7 @@
<span t-field="company.partner_id.vat"/> <span t-field="company.partner_id.vat"/>
<br/> <br/>
</div> </div>
</div> </div> -->
</div> </div>
<t t-call="web.external_layout"> <t t-call="web.external_layout">
@@ -134,8 +137,7 @@
<thead> <thead>
<tr> <tr>
<th style="background-color:#893b74 !important;color:#FFF !important;">Product</th> <th style="background-color:#893b74 !important;color:#FFF !important;">Product</th>
<th style="background-color:#893b74 !important;color:#FFF !important;">Ordered <th style="background-color:#893b74 !important;color:#FFF !important;">Ordered Quantity
Quantity
</th> </th>
</tr> </tr>
</thead> </thead>