mirror of
https://gitlab.com/sonalarora/tra_backend.git
synced 2025-12-17 18:29:08 +02:00
Merge branch 'master' of https://gitlab.com/sonalarora/tra_backend
This commit is contained in:
@@ -14,6 +14,7 @@
|
|||||||
],
|
],
|
||||||
'data': [
|
'data': [
|
||||||
'views/invoice_report.xml',
|
'views/invoice_report.xml',
|
||||||
|
'views/sale_report.xml',
|
||||||
],
|
],
|
||||||
'demo': [],
|
'demo': [],
|
||||||
'images': [],
|
'images': [],
|
||||||
|
|||||||
Binary file not shown.
@@ -1,4 +1,5 @@
|
|||||||
from odoo import models, api, fields
|
from odoo import models, api, fields
|
||||||
|
import datetime
|
||||||
from datetime import date
|
from datetime import date
|
||||||
|
|
||||||
|
|
||||||
@@ -14,6 +15,8 @@ class AccountMove(models.Model):
|
|||||||
sale_id = self.env['sale.order'].sudo().search([('name', '=', rec.invoice_origin)])
|
sale_id = self.env['sale.order'].sudo().search([('name', '=', rec.invoice_origin)])
|
||||||
for doc in sale_id:
|
for doc in sale_id:
|
||||||
rec.print_date = doc.signed_on
|
rec.print_date = doc.signed_on
|
||||||
|
else:
|
||||||
|
rec.print_date = date.today()
|
||||||
|
|
||||||
|
|
||||||
def compute_signature(self):
|
def compute_signature(self):
|
||||||
|
|||||||
@@ -27,8 +27,8 @@
|
|||||||
</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">
|
||||||
<p>E & OE</p><br/>
|
<p>E & OE</p><br/>
|
||||||
<span>Print Date: <!-- <span t-esc="o.print_date"/> --></span><br/>
|
<span>Print Date: <span t-esc="o.print_date"/></span><br/>
|
||||||
<span>Signed by: <!-- <span t-esc="o.signed_by"/> --></span>
|
<span>Signed by: <span t-esc="o.signed_by"/></span>
|
||||||
</xpath>
|
</xpath>
|
||||||
</template>
|
</template>
|
||||||
<template id="report_invoices_inherit2" inherit_id="bi_professional_reports_templates.classic_report_invoice_document">
|
<template id="report_invoices_inherit2" inherit_id="bi_professional_reports_templates.classic_report_invoice_document">
|
||||||
@@ -47,8 +47,8 @@
|
|||||||
</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">
|
||||||
<p>E & OE</p><br/>
|
<p>E & OE</p><br/>
|
||||||
<span>Print Date: <!-- <span t-esc="o.print_date"/> --></span><br/>
|
<span>Print Date: <span t-esc="o.print_date"/></span><br/>
|
||||||
<span>Signed by: <!-- <span t-esc="o.signed_by"/> --></span>
|
<span>Signed by: <span t-esc="o.signed_by"/></span>
|
||||||
</xpath>
|
</xpath>
|
||||||
</template>
|
</template>
|
||||||
<template id="report_invoices_inherit3" inherit_id="bi_professional_reports_templates.modern_report_invoice_document">
|
<template id="report_invoices_inherit3" inherit_id="bi_professional_reports_templates.modern_report_invoice_document">
|
||||||
@@ -67,12 +67,8 @@
|
|||||||
</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">
|
||||||
<p>E & OE</p><br/>
|
<p>E & OE</p><br/>
|
||||||
<span>Print Date: <!-- <span t-esc="o.print_date"/> -->
|
<span>Print Date: <span t-esc="o.print_date"/></span><br/>
|
||||||
|
<span>Signed by: <span t-esc="o.signed_by"/></span>
|
||||||
</span><br/>
|
|
||||||
<span>Signed by:<!-- <span t-esc="o.signed_by"/> -->
|
|
||||||
|
|
||||||
</span>
|
|
||||||
</xpath>
|
</xpath>
|
||||||
</template>
|
</template>
|
||||||
<template id="report_invoices_inherit4" inherit_id="bi_professional_reports_templates.odoo_std_report_invoice_document">
|
<template id="report_invoices_inherit4" inherit_id="bi_professional_reports_templates.odoo_std_report_invoice_document">
|
||||||
@@ -91,9 +87,8 @@
|
|||||||
</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">
|
||||||
<p>E & OE</p><br/>
|
<p>E & OE</p><br/>
|
||||||
<span>Print Date: <!-- <span t-esc="o.print_date"/> -->
|
<span>Print Date: <span t-esc="o.print_date"/></span><br/>
|
||||||
</span><br/>
|
<span>Signed by: <span t-esc="o.signed_by"/></span>
|
||||||
<span>Signed by: <!-- <span t-esc="o.signed_by"/> --></span>
|
|
||||||
</xpath>
|
</xpath>
|
||||||
</template>
|
</template>
|
||||||
</odoo>
|
</odoo>
|
||||||
67
reports/views/sale_report.xml
Normal file
67
reports/views/sale_report.xml
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<odoo>
|
||||||
|
<template id="custom_sale_report" inherit_id="bi_professional_reports_templates.fency_report_saleorder_document">
|
||||||
|
<xpath expr="//t[@t-call='web.external_layout']/div/div[2]/div[1]" position="after">
|
||||||
|
<strong>Validity:</strong><br/>
|
||||||
|
<strong>Sales Code:</strong><br/>
|
||||||
|
<strong>RFQ</strong><br/>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//t[@t-call='web.external_layout']/div/div[2]" position="after">
|
||||||
|
<span style="color:blue;">NOTE:</span><br/>
|
||||||
|
<span style="color:blue;">All prices quoted are new materials.</span>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//t[@t-call='web.external_layout']/div/div[5]" position="after">
|
||||||
|
<span>Kind Regards</span><br/>
|
||||||
|
<span t-esc="doc.partner_id.name"/><br/>
|
||||||
|
<span t-esc="doc.partner_id.mobile"/><br/>
|
||||||
|
</xpath>
|
||||||
|
</template>
|
||||||
|
<template id="custom_sale_report1" inherit_id="bi_professional_reports_templates.classic_report_saleorder_document">
|
||||||
|
<xpath expr="//t[@t-call='web.external_layout']/div/div[2]/table[1]" position="after">
|
||||||
|
<strong>Validity:</strong><br/>
|
||||||
|
<strong>Sales Code:</strong><br/>
|
||||||
|
<strong>RFQ</strong><br/>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//t[@t-call='web.external_layout']/div/div[2]/table[2]" position="after">
|
||||||
|
<span style="color:blue;">NOTE:</span><br/>
|
||||||
|
<span style="color:blue;">All prices quoted are new materials.</span>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//t[@t-call='web.external_layout']/div/div[5]" position="after">
|
||||||
|
<span>Kind Regards</span><br/>
|
||||||
|
<span t-esc="doc.partner_id.name"/><br/>
|
||||||
|
<span t-esc="doc.partner_id.mobile"/><br/>
|
||||||
|
</xpath>
|
||||||
|
</template>
|
||||||
|
<template id="custom_sale_report2" inherit_id="bi_professional_reports_templates.modern_report_saleorder_document">
|
||||||
|
<xpath expr="//t[@t-call='web.external_layout']/div/table[1]" position="after">
|
||||||
|
<strong>Validity:</strong><br/>
|
||||||
|
<strong>Sales Code:</strong><br/>
|
||||||
|
<strong>RFQ</strong><br/>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//t[@t-call='web.external_layout']/div/table[2]" position="after">
|
||||||
|
<span style="color:blue;">NOTE:</span><br/>
|
||||||
|
<span style="color:blue;">All prices quoted are new materials.</span>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//t[@t-call='web.external_layout']/div/div[4]" position="after">
|
||||||
|
<span>Kind Regards</span><br/>
|
||||||
|
<span t-esc="doc.partner_id.name"/><br/>
|
||||||
|
<span t-esc="doc.partner_id.mobile"/><br/>
|
||||||
|
</xpath>
|
||||||
|
</template>
|
||||||
|
<template id="custom_sale_report3" inherit_id="bi_professional_reports_templates.odoo_std_report_saleorder_document">
|
||||||
|
<xpath expr="//t[@t-call='web.external_layout']/div/div[2]" position="after">
|
||||||
|
<strong>Validity:</strong><br/>
|
||||||
|
<strong>Sales Code:</strong><br/>
|
||||||
|
<strong>RFQ</strong><br/>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//t[@t-call='web.external_layout']/div/table[1]" position="after">
|
||||||
|
<span style="color:blue;">NOTE:</span><br/>
|
||||||
|
<span style="color:blue;">All prices quoted are new materials.</span>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//t[@t-call='web.external_layout']/div/div[6]" position="after">
|
||||||
|
<span>Kind Regards</span><br/>
|
||||||
|
<span t-esc="doc.partner_id.name"/><br/>
|
||||||
|
<span t-esc="doc.partner_id.mobile"/><br/>
|
||||||
|
</xpath>
|
||||||
|
</template>
|
||||||
|
</odoo>
|
||||||
Reference in New Issue
Block a user