work on report

This commit is contained in:
sonal arora
2020-09-16 12:51:18 +00:00
3 changed files with 26 additions and 15 deletions

View File

@@ -89,12 +89,16 @@
<span> <span>
<div class="row"> <div class="row">
<div class ="col-3">Origin</div>: <div class="col-12" style="font:13px lucida-console,sans-serif !important; background-color: #3498DB;">
<div class="col-4"><span t-field="o.picking_type_id"/></div> <div class ="col-4"><span><font color="#fff">Origin</font></span>:
</div> <span style="color:#FFF !important;" t-field="o.picking_type_id"/></div>
<div class ="col-4"><span><font color="#fff">Scheduled Date</font></span>:
<span style="color:#FFF !important;" t-field="o.scheduled_date"/></div>
</div>
</div>
</span> </span>
<!-- </div> --> <!-- </div>
<span> <span>
<font color="#fff"> <font color="#fff">
@@ -103,7 +107,7 @@
<div class="col-4"><span t-field="o.scheduled_date"/></div> <div class="col-4"><span t-field="o.scheduled_date"/></div>
</div> </div>
</font> </font>
</span> </span>-->
<br/> <br/>
@@ -239,17 +243,17 @@
<tr rowspan="2"> <tr rowspan="2">
<td colspan="6">Transport</td> <td colspan="6">Transport</td>
<td colspan="3">Material Received by</td> <td colspan="3">Material Received by</td>
<td colspan="2">Deleivery Given by</td> <td colspan="4">Deleivery Given by</td>
</tr> </tr>
<tr rowspan="2"> <tr rowspan="2">
<td colspan="6">Deriver's Name</td> <td colspan="6">Deriver's Name</td>
<td colspan="3">Signature</td> <td colspan="3">Signature</td>
<td colspan="2">Signature</td> <td colspan="4">Signature</td>
</tr> </tr>
<tr rowspan="2"> <tr rowspan="2">
<td colspan="6">Truck No.</td> <td colspan="6">Truck No.</td>
<td colspan="3">Date</td> <td colspan="3">Date</td>
<td colspan="2">Date</td> <td colspan="4">Date</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View File

@@ -78,7 +78,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row mt32 mb32"> <div class="row mt32 mb32">
<div class="col-3" style="font:15px lucida-console,sans-serif !important;"> <div class="col-3" style="font:15px lucida-console,sans-serif !important;">
<strong>Customer Address</strong> <strong>Customer Address</strong>
<br/> <br/>
@@ -102,6 +102,8 @@
<table class="table table-sm"> <table class="table table-sm">
<thead> <thead>
<tr> <tr>
<th style="background-color:#3498DB !important;color:#FFF">S.No
</th>
<th style="background-color:#3498DB !important;color:#FFF !important;">Description <th style="background-color:#3498DB !important;color:#FFF !important;">Description
</th> </th>
<th <th
@@ -123,7 +125,12 @@
</tr> </tr>
</thead> </thead>
<tbody class="invoice_tbody"> <tbody class="invoice_tbody">
<t t-set="seq_move" t-value="1"/>
<tr t-foreach="o.invoice_line_ids" t-as="l"> <tr t-foreach="o.invoice_line_ids" t-as="l">
<td>
<t t-esc="seq_move"></t>
</td>
<t t-set="seq_move" t-value="seq_move+1"/>
<td> <td>
<span t-field="l.name"/> <span t-field="l.name"/>
</td> </td>

View File

@@ -53,16 +53,16 @@
<span>NOTE</span><br/> <span>NOTE</span><br/>
<span t-esc="o.note"/> <span t-esc="o.note"/>
</xpath> </xpath>
<xpath expr="//table[@class='table table-sm']/thead/tr/th[1]" position="before"> <xpath expr="//table[@class='table table-sm']/thead/tr/th[1]" position="after">
<th style="background-color:#3498DB !important;color:#FFF">S.No</th>
<th style="background-color:#3498DB !important;color:#FFF">Code</th> <th style="background-color:#3498DB !important;color:#FFF">Code</th>
<!-- <th style="background-color:#3498DB !important;color:#FFF">Code</th> -->
</xpath> </xpath>
<xpath expr="//table[@class='table table-sm']/tbody/tr/td[1]" position="before"> <xpath expr="//table[@class='table table-sm']/tbody/tr/td[1]" position="after">
<t t-set="seq_move" t-value="1"/> <!-- <t t-set="seq_move" t-value="1"/>
<td> <td colspan="2">
<t t-esc="seq_move"></t> <t t-esc="seq_move"></t>
</td> </td>
<t t-set="seq_move" t-value="seq_move+1"/> <t t-set="seq_move" t-value="seq_move+1"/> -->
<td><span t-esc="l.product_id.default_code"/></td> <td><span t-esc="l.product_id.default_code"/></td>
</xpath> </xpath>
<xpath expr="//t[@t-call='web.external_layout']/div/p[last()]" position="after"> <xpath expr="//t[@t-call='web.external_layout']/div/p[last()]" position="after">