TechnoLibre/bemade-addons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bemade_fsm: cleaning up template files.

Browse source
This commit is contained in:
Marc Durepos 2023-08-04 15:38:44 -04:00
parent e845f84ab5
commit 7b5a7b63c2
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bemade_fsm/reports/worksheet_custom_report_templates.xml
View file

@ -39,7 +39,6 @@
<t t-set="is_any_total_discount_line" t-value="False"/> <t t-set="is_any_total_discount_line" t-value="False"/>
<t t-set="section_lines" t-value="order_lines.filtered(lambda l: l.display_type == 'line_section')"/> <t t-set="section_lines" t-value="order_lines.filtered(lambda l: l.display_type == 'line_section')"/>
<t t-foreach="order_lines" t-as="line"> <t t-foreach="order_lines" t-as="line">
<!-- <t t-set="is_task" t-value="line == doc.sale_line_id"/>-->
<t t-set="final_subtotal" <t t-set="final_subtotal"
t-value="final_subtotal + line.delivered_price_subtotal"/> t-value="final_subtotal + line.delivered_price_subtotal"/>
<t t-set="final_total" <t t-set="final_total"
@ -76,7 +75,6 @@
</tr> </tr>
</thead> </thead>
<tbody class="sale_tbody"> <tbody class="sale_tbody">
<t t-set="current_subtotal" t-value="0"/> <t t-set="current_subtotal" t-value="0"/>
<t t-foreach="order_lines" t-as="line"> <t t-foreach="order_lines" t-as="line">
<t t-set="is_task" t-value="line == doc.sale_line_id"/> <t t-set="is_task" t-value="line == doc.sale_line_id"/>
@ -85,11 +83,9 @@
<t t-set="current_subtotal" <t t-set="current_subtotal"
t-value="current_subtotal + line.delivered_price_subtotal" t-value="current_subtotal + line.delivered_price_subtotal"
groups="account.group_show_line_subtotals_tax_excluded"/> groups="account.group_show_line_subtotals_tax_excluded"/>
<t t-set="current_total" <t t-set="current_total"
t-value="current_subtotal + line.delivered_price_total" t-value="current_subtotal + line.delivered_price_total"
groups="account.group_show_line_subtotals_tax_included"/> groups="account.group_show_line_subtotals_tax_included"/>
<tr t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''"> <tr t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''">
<t t-if="not line.display_type and not line.is_downpayment"> <t t-if="not line.display_type and not line.is_downpayment">
<td><span t-field="line.name"/></td> <td><span t-field="line.name"/></td>
@ -170,7 +166,6 @@
</div> </div>
</div> </div>
<div t-if="doc.worksheet_signature"> <div t-if="doc.worksheet_signature">
<div t-if="report_type == html" class="ribbon" style=" <div t-if="report_type == html" class="ribbon" style="
position: absolute; position: absolute;
right: 0px; top: 0px; right: 0px; top: 0px;
@ -193,7 +188,6 @@
Signed Signed
</span> </span>
</div> </div>
<div t-attf-class="#{'col-12 col-lg-3' if report_type != 'html' else 'col-sm-7 col-md-4'} ml-auto text-right" style="page-break-inside: avoid"> <div t-attf-class="#{'col-12 col-lg-3' if report_type != 'html' else 'col-sm-7 col-md-4'} ml-auto text-right" style="page-break-inside: avoid">
<h5>Signature</h5> <h5>Signature</h5>
<img t-att-src="image_data_uri(doc.worksheet_signature)" style="max-height: 6rem; max-width: 100%; color:black;"/><br/> <img t-att-src="image_data_uri(doc.worksheet_signature)" style="max-height: 6rem; max-width: 100%; color:black;"/><br/>
@ -202,7 +196,6 @@
</div> </div>
</div> </div>
</template> </template>
<template id="work_order"> <template id="work_order">
<t t-call="web.html_container"> <t t-call="web.html_container">
<t t-foreach="docs" t-as="doc"> <t t-foreach="docs" t-as="doc">
@ -213,6 +206,7 @@
</t> </t>
</t> </t>
</template> </template>
<!-- Make the front-end "Sign" page show our new template -->
<template id="portal_my_worksheet" <template id="portal_my_worksheet"
inherit_id="industry_fsm_report.portal_my_worksheet"> inherit_id="industry_fsm_report.portal_my_worksheet">
<xpath expr="//div[@t-call='industry_fsm_report.worksheet_custom_page']" <xpath expr="//div[@t-call='industry_fsm_report.worksheet_custom_page']"

7
bemade_fsm/reports/worksheet_custom_reports.xml
View file

@ -7,12 +7,7 @@
<field name="report_file">bemade_fsm.work_order</field> <field name="report_file">bemade_fsm.work_order</field>
<field name="print_report_name">'%s Work Order %s' % ( <field name="print_report_name">'%s Work Order %s' % (
time.strftime('%Y-%m-%d'), object.name)</field> time.strftime('%Y-%m-%d'), object.name)</field>
<field name="report_type">qweb-html</field> <field name="report_type">qweb-pdf</field>
</record> </record>
<!-- <record id="work_order_template" model="worksheet.template">-->
<!-- <field name="name">Basic Work Order</field>-->
<!-- <field name="res_model">project.task</field>-->
<!-- </record>-->
</data> </data>
</odoo> </odoo>