sync from 14.0
This commit is contained in:
janikvonrotz committed
1 parent
7f50c95171
commit
e2fcb456b6
7 files changed
+161
-18
No files matched your search
@@ -62,7 +62,7 @@
|
||||
</td>
|
||||
<td>Delivery Date</td>
|
||||
<td>
|
||||
<span t-field='o.sale_order_id.effective_date'/>
|
||||
<span t-field='o.picking_ids.date_done' t-options='{ "widget": "date" }'/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="purchase.report_purchasequotation_document" priority="60">
|
||||
|
||||
<xpath expr="//div[hasclass('page')]" position="before">
|
||||
<style>
|
||||
table.trimada {
|
||||
font-size: 9pt;
|
||||
font-family: arial;
|
||||
color: black;
|
||||
}
|
||||
table.trimada tr.first td {
|
||||
padding-bottom: 0;
|
||||
}
|
||||
table.trimada tr.second td {
|
||||
padding-top: 0;
|
||||
}
|
||||
table.trimada tr.second {
|
||||
border-bottom: 1px solid rgb(220,220,220);
|
||||
}
|
||||
table.trimada thead tr {
|
||||
border-top:solid 1px;
|
||||
border-bottom: solid 1px;
|
||||
}
|
||||
table.trimada thead th#position {
|
||||
width: 5mm;
|
||||
}
|
||||
table.trimada thead th#default_code {
|
||||
width: 27mm;
|
||||
text-align: right;
|
||||
}
|
||||
table.trimada thead th#open_quantity {
|
||||
width: 30mm;
|
||||
text-align: right;
|
||||
}
|
||||
table.trimada thead th#quantity {
|
||||
width: 25mm;
|
||||
text-align: right !important;
|
||||
}
|
||||
table.trimada tbody td#position {
|
||||
text-align: right;
|
||||
}
|
||||
table.trimada tbody td#default_code {
|
||||
text-align: right;
|
||||
}
|
||||
table.trimada tbody td#open_quantity {
|
||||
text-align: right !important;
|
||||
}
|
||||
table.trimada tbody td#quantity {
|
||||
text-align: right;
|
||||
}
|
||||
table.trimada tbody span#qty {
|
||||
font-weight: bold;
|
||||
}
|
||||
table.trimada tbody span#open_qty {
|
||||
font-weight: bold;
|
||||
}
|
||||
.subtitel {
|
||||
font-size: 11pt;
|
||||
font-family: arial;
|
||||
margin-top: 10mm;
|
||||
}
|
||||
.note {
|
||||
font-size: 9pt;
|
||||
font-family: arial;
|
||||
}
|
||||
</style>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[2]" position="attributes">
|
||||
<attribute name="class" separator=" " add="trimada table-borderless"/>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//div[@name='information_block']" position="attributes">
|
||||
<attribute name="class" separator=" " add="trimada table-borderless"/>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0"?>
|
||||
<t t-name="sale.report_saleconfirmation.base">
|
||||
<t t-call="web.html_container">
|
||||
<t t-foreach="docs" t-as="doc">
|
||||
<t t-set="is_confirmation" t-value="True"/>
|
||||
<t t-call="sale.report_saleorder_document" t-lang="doc.partner_id.lang"/>
|
||||
</t>
|
||||
</t>
|
||||
</t>
|
||||
@@ -0,0 +1,44 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale.report_saleorder_document" priority="50">
|
||||
|
||||
<style>
|
||||
.address {
|
||||
font-size: 10pt;
|
||||
font-family: arial;
|
||||
line-height: 1.2;
|
||||
text-align: left;
|
||||
}
|
||||
.title {
|
||||
font-size: 8pt;
|
||||
font-weight: bold;
|
||||
}
|
||||
.margin {
|
||||
padding-bottom: 33mm;
|
||||
}
|
||||
</style>
|
||||
|
||||
<xpath expr="//t[@t-set='address']/div" position="replace">
|
||||
<div class="address margin">
|
||||
<t t-if="doc.partner_contact_id.parent_name">
|
||||
<div t-field="doc.partner_contact_id" t-options="{"widget": "contact", "fields": ["address", "name"], "no_marker": True, "phone_icons": False}" name="partner_contact_id"/>
|
||||
</t>
|
||||
<t t-if="not doc.partner_contact_id.parent_name">
|
||||
<div t-field="doc.partner_contact_id" t-options="{"widget": "contact", "fields": ["address", "name"], "no_marker": True, "phone_icons": False}" name="partner_contact_id"/>
|
||||
</t>
|
||||
</div>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//t[@t-set='information_block']/../t" position="replace">
|
||||
<t class="address" t-set="information_block">
|
||||
<t t-if="doc.partner_shipping_id == doc.partner_invoice_id">
|
||||
<div class="title">Invoicing and Shipping Address:</div>
|
||||
<div t-field="doc.partner_shipping_id" t-options="{"widget": "contact", "fields": ["address", "name"], "no_marker": True, "phone_icons": False}"/>
|
||||
</t>
|
||||
<t t-if="doc.partner_shipping_id != doc.partner_invoice_id">
|
||||
<div class="title">Shipping Address:</div>
|
||||
<div t-field="doc.partner_shipping_id" t-options="{"widget": "contact", "fields": ["address", "name"], "no_marker": True, "phone_icons": False}"/>
|
||||
</t>
|
||||
</t>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,18 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale.report_saleorder_document" priority="50">
|
||||
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale.report_saleorder_document" priority="60">
|
||||
|
||||
<span id="qty" position="replace">
|
||||
<t t-if="confirmation">
|
||||
<span t-field="line.product_uom_qty"/>
|
||||
</t>
|
||||
<t t-else="">
|
||||
<span t-field="line.product_uom_qty"/>
|
||||
</t>
|
||||
</span>
|
||||
|
||||
</data>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale.report_saleorder_document" priority="50">
|
||||
|
||||
<xpath expr="//h2/t[1]" position="replace">
|
||||
<t t-if="not (env.context.get('proforma', False) or is_pro_forma)">
|
||||
<span t-if="confirmation">Confirmation # </span>
|
||||
<span t-if="doc.state not in ['draft','sent'] and not is_confirmation">Order # </span>
|
||||
<span t-if="doc.state in ['draft','sent'] and not is_confirmation">Quotation # </span>
|
||||
</t>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,17 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale.report_saleorder_document" priority="50">
|
||||
|
||||
<xpath expr="//t/t/t[3]" position="replace">
|
||||
<t t-set="information_block">
|
||||
<t t-if="doc.partner_shipping_id == doc.partner_invoice_id">
|
||||
<div style="font-size:10pt; line-height: 1.2; font-weight:bold">Invoicing and Shipping Address:</div>
|
||||
<div style="font-size:10pt; line-height: 1.2" t-field="doc.partner_shipping_id" t-options="{"widget": "contact", "fields": ["address", "name"], "no_marker": True, "phone_icons": False}"/>
|
||||
</t>
|
||||
<t t-if="doc.partner_shipping_id != doc.partner_invoice_id">
|
||||
<div style="font-size:10pt; line-height: 1.2; font-weight:bold">Shipping Address:</div>
|
||||
<div style="font-size:10pt; line-height: 1.2" t-field="doc.partner_shipping_id" t-options="{"widget": "contact", "fields": ["address", "name"], "no_marker": True, "phone_icons": False}"/>
|
||||
</t>
|
||||
</t>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
Reference in new issue
Block a user