Merge branch '16.0' of github.com:Mint-System/Odoo-Build into 16.0
This commit is contained in:
14 files changed
+436
-337
No files matched your search
@@ -7,6 +7,7 @@
|
||||
width: 98%;
|
||||
margin: 0 0 10px 10px;
|
||||
font-size: 10pt;
|
||||
border-color: white;
|
||||
}
|
||||
table#section_consumed_products th {
|
||||
font-size: 10pt;
|
||||
@@ -26,6 +27,11 @@
|
||||
margin-top: 30px;
|
||||
font-size: 14pt;
|
||||
padding-left:10px;
|
||||
text-align: left;
|
||||
border-color: white;
|
||||
}
|
||||
table#note th {
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -82,4 +88,4 @@
|
||||
</table>
|
||||
|
||||
</xpath>
|
||||
</data>
|
||||
</data>
|
||||
+3
-1
@@ -1,4 +1,5 @@
|
||||
<data inherit_id="mrp.report_mrp_production_components" priority="50">
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="mrp.report_mrporder" priority="50">
|
||||
|
||||
<xpath expr="//h3" position="replace">
|
||||
<style>
|
||||
@@ -8,6 +9,7 @@
|
||||
font-size: 14pt;
|
||||
font-weight: bold;
|
||||
padding-left: 5px;
|
||||
border-color: white;
|
||||
}
|
||||
</style>
|
||||
<table id="consumed_products">
|
||||
|
||||
@@ -1,23 +1,24 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="mrp.workcenter_line_kanban" priority="50">
|
||||
<xpath expr="//h5" position="replace">
|
||||
<h5 class="oe_kanban_bottom_left">
|
||||
<table>
|
||||
<tr>
|
||||
<td class="font-weight-bold">
|
||||
|
||||
<xpath expr="//div[@class='o_kanban_workorder_date']/h5" position="replace"/>
|
||||
|
||||
<xpath expr="//div[@class='o_kanban_record_bottom']/h5" position="replace">
|
||||
<h5 class="oe_kanban_bottom_left">
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
Start Datum: <field name="date_planned_start" type="date"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<span><t t-esc="record.product_id.value"/>, </span>
|
||||
<span>
|
||||
<t t-esc="record.qty_production.value"/>
|
||||
<t t-esc="record.product_uom_id.value"/>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</h5>
|
||||
</xpath>
|
||||
</data>
|
||||
</tr>
|
||||
<tr style="font-weight: normal;">
|
||||
<td>
|
||||
<span><t t-esc="record.product_id.value"/>, </span> <span><t t-esc="record.qty_production.value"/> <t t-esc="record.product_uom_id.value"/></span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</h5>
|
||||
</xpath>
|
||||
</data>
|
||||
@@ -7,6 +7,7 @@
|
||||
width: 100%;
|
||||
font-size: 8pt;
|
||||
margin-top: 25px;
|
||||
border-color: white;
|
||||
}
|
||||
table#footer tr, td {
|
||||
vertical-align: top;
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="purchase.report_purchaseorder_document" priority="50">
|
||||
|
||||
<xpath expr="//div[@id='informations']" position="before">
|
||||
<style>
|
||||
table#info {
|
||||
width: 100%;
|
||||
margin-bottom: 25px;
|
||||
font-size: 9pt;
|
||||
font-family: arial;
|
||||
border-color: white;
|
||||
}
|
||||
table#info tr {
|
||||
line-height: 1.2;
|
||||
text-align: left;
|
||||
}
|
||||
.note {
|
||||
font-size: 9pt;
|
||||
}
|
||||
</style>
|
||||
<table id="info">
|
||||
<tr>
|
||||
<td width="17%">Oder Date</td>
|
||||
<td width="40%">
|
||||
<t t-if="o.date_approve">
|
||||
<span id="date_approve" t-field="o.date_approve" t-options="{ "widget": "date" }"/>
|
||||
</t>
|
||||
<t t-else="">
|
||||
<span t-field="o.date_order" t-options="{ "widget": "date" }"/>
|
||||
</t>
|
||||
</td>
|
||||
<td width="18%">Our Reference</td>
|
||||
<td width="25%">
|
||||
<span t-field="o.user_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Customer No.</td>
|
||||
<td>
|
||||
<span t-field="o.partner_id.ref"/>
|
||||
</td>
|
||||
<td>Incoterm</td>
|
||||
<td>
|
||||
<span t-field="o.incoterm_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td/>
|
||||
|
||||
<td>
|
||||
<span t-field="o.partner_ref"/>
|
||||
</td>
|
||||
|
||||
<t t-if="o.requisition_id">
|
||||
<td>Purchase Contract</td>
|
||||
<td>
|
||||
<span t-field="o.requisition_id"/>
|
||||
<t t-if="o.requisition_id.partner_ref"> / <span t-field="o.requisition_id.partner_ref"/>
|
||||
</t>
|
||||
</td>
|
||||
</t>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Reference</td>
|
||||
<td>
|
||||
<span t-field="o.comment"/>
|
||||
</td>
|
||||
<td/>
|
||||
<td/>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<t t-if="o.note_header != '<p><br></p>'">
|
||||
<span class="note" t-field="o.note_header"/>
|
||||
</t>
|
||||
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,3 +1,4 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="purchase.report_purchasequotation_document" priority="50">
|
||||
|
||||
<xpath expr="//div[@class='oe_structure']/.." position="after">
|
||||
@@ -5,6 +6,7 @@
|
||||
table#footer {
|
||||
width: 100%;
|
||||
font-size: 8pt;
|
||||
border-color: white;
|
||||
}
|
||||
table#footer tr, td {
|
||||
vertical-align: top;
|
||||
@@ -28,4 +30,4 @@
|
||||
</table>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
</data>
|
||||
@@ -1,12 +1,14 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="purchase.report_purchasequotation_document" priority="50">
|
||||
<xpath expr="//h2" position="after">
|
||||
<style>
|
||||
|
||||
<xpath expr="//h2" position="after">
|
||||
<style>
|
||||
table#info {
|
||||
width: 100%;
|
||||
margin-bottom: 25px;
|
||||
font-size: 9pt;
|
||||
font-family: arial;
|
||||
border-color: white;
|
||||
}
|
||||
table#info tr {
|
||||
line-height: 1.2;
|
||||
@@ -16,88 +18,57 @@
|
||||
font-size: 9pt;
|
||||
}
|
||||
</style>
|
||||
<table id="info">
|
||||
<tr>
|
||||
<td width="17%">Order Deadline</td>
|
||||
<td width="40%">
|
||||
<span t-field="o.date_order" t-options="{ "widget": "date" }"/>
|
||||
</td>
|
||||
<td width="18%">Our Reference</td>
|
||||
<td width="25%">
|
||||
<span t-field="o.user_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Customer No.</td>
|
||||
<td>
|
||||
<span t-field="o.partner_id.ref"/>
|
||||
</td>
|
||||
<td>Incoterm</td>
|
||||
<td>
|
||||
<span t-field="o.incoterm_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td/>
|
||||
<td>
|
||||
<span t-field="o.partner_ref"/>
|
||||
</td>
|
||||
<t t-if="o.requisition_id">
|
||||
<td>Purchase Contract</td>
|
||||
<td>
|
||||
<span t-field="o.requisition_id"/>
|
||||
<t t-if="o.requisition_id.partner_ref"> / <span t-field="o.requisition_id.partner_ref"/>
|
||||
</t>
|
||||
</td>
|
||||
</t>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Reference</td>
|
||||
<td>
|
||||
<span t-field="o.comment"/>
|
||||
</td>
|
||||
<td/>
|
||||
<td/>
|
||||
</tr>
|
||||
</table>
|
||||
<t t-if="o.note_header != '<p><br></p>'">
|
||||
<span class="note" t-field="o.note_header"/>
|
||||
</t>
|
||||
</xpath>
|
||||
<!--
|
||||
<xpath expr="//h2" position="after">
|
||||
<div id="informations">
|
||||
<table width="100%">
|
||||
<table id="info">
|
||||
<tr>
|
||||
<td width="17%">Kunden-Nr.</td>
|
||||
<td width="41%">
|
||||
<span t-field="o.partner_id.ref"/>
|
||||
</td>
|
||||
<td width="17%">Datum</td>
|
||||
<td width="25%">
|
||||
<td width="17%">Order Deadline</td>
|
||||
<td width="40%">
|
||||
<span t-field="o.date_order" t-options="{ "widget": "date" }"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Ihre Referenz</td>
|
||||
<td>
|
||||
<span t-field="o.partner_ref"/>
|
||||
</td>
|
||||
<td>Kontaktperson</td>
|
||||
<td>
|
||||
<td width="18%">Our Reference</td>
|
||||
<td width="25%">
|
||||
<span t-field="o.user_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td/>
|
||||
<td/>
|
||||
<td>Mwst-Nr:</td>
|
||||
<td>Customer No.</td>
|
||||
<td>
|
||||
<span t-field="res_company.vat"/> MWST
|
||||
<span t-field="o.partner_id.ref"/>
|
||||
</td>
|
||||
<td>Incoterm</td>
|
||||
<td>
|
||||
<span t-field="o.incoterm_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td/>
|
||||
<td>
|
||||
<span t-field="o.partner_ref"/>
|
||||
</td>
|
||||
|
||||
<t t-if="o.requisition_id">
|
||||
<td>Purchase Contract</td>
|
||||
<td>
|
||||
<span t-field="o.requisition_id"/>
|
||||
<t t-if="o.requisition_id.partner_ref"> / <span t-field="o.requisition_id.partner_ref"/>
|
||||
</t>
|
||||
</td>
|
||||
</t>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Reference</td>
|
||||
<td>
|
||||
<span t-field="o.comment"/>
|
||||
</td>
|
||||
<td/>
|
||||
<td/>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</xpath>
|
||||
-->
|
||||
</data>
|
||||
|
||||
<t t-if="o.note_header != '<p><br></p>'">
|
||||
<span class="note" t-field="o.note_header"/>
|
||||
</t>
|
||||
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,29 +1,35 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
|
||||
<xpath expr="//table[@id='main_table']" position="after">
|
||||
<style>
|
||||
|
||||
<xpath expr="//table[@id='main_table']" position="after">
|
||||
|
||||
<style>
|
||||
table#footer {
|
||||
width: 100%;
|
||||
font-size: 8pt;
|
||||
border-color: white;
|
||||
}
|
||||
table#footer tr, td {
|
||||
vertical-align: top;
|
||||
}
|
||||
</style>
|
||||
<table id="footer">
|
||||
<tr>
|
||||
<td width="50%" t-if="o.payment_term_id.note">Zahlungsbedingungen
|
||||
<span t-field="o.payment_term_id.note"/>
|
||||
<table id="footer">
|
||||
<tr>
|
||||
<td width="50%" t-if="o.payment_term_id">
|
||||
<span>Zahlungsbedingungen </span>
|
||||
<span t-field="o.payment_term_id"/>
|
||||
</td>
|
||||
<td width="50%">
|
||||
Lieferung gemäss unseren allgemeinen Einkaufsbedingungen
|
||||
<td width="50%">
|
||||
<span>Lieferung gemäss unseren allgemeinen Einkaufsbedingungen</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>MWST-Nr:
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<span>MWST-Nr: </span>
|
||||
<span t-field="o.company_id.vat"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</xpath>
|
||||
</data>
|
||||
</tr>
|
||||
</table>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,12 +1,14 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
|
||||
<xpath expr="//h2" position="after">
|
||||
<style>
|
||||
|
||||
<xpath expr="//h2" position="after">
|
||||
<style>
|
||||
table#info {
|
||||
width: 100%;
|
||||
margin-bottom: 25px;
|
||||
font-size: 9pt;
|
||||
font-family: arial;
|
||||
border-color: white;
|
||||
}
|
||||
table#info tr {
|
||||
line-height: 1.2;
|
||||
@@ -16,45 +18,47 @@
|
||||
font-size: 9pt;
|
||||
}
|
||||
</style>
|
||||
<table id="info">
|
||||
<tr>
|
||||
<td width="17%">Date</td>
|
||||
<td width="40%">
|
||||
<span t-field="o.ordering_date" t-options="{ "widget": "date" }"/>
|
||||
</td>
|
||||
<td width="18%">Our Reference</td>
|
||||
<td width="25%">
|
||||
<span t-field="o.user_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Customer No.</td>
|
||||
<td>
|
||||
<span t-field="o.vendor_id.ref"/>
|
||||
</td>
|
||||
<td>Incoterm</td>
|
||||
<td>
|
||||
<span t-field="o.incoterm_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td/>
|
||||
<td>
|
||||
<span t-field="o.partner_ref"/>
|
||||
</td>
|
||||
<td>Agreement Deadline</td>
|
||||
<td>
|
||||
<span t-field="o.date_end" t-options="{ "widget": "date" }"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Reference</td>
|
||||
<td>
|
||||
<span t-field="o.comment"/>
|
||||
</td>
|
||||
<td/>
|
||||
<td/>
|
||||
</tr>
|
||||
</table>
|
||||
</xpath>
|
||||
</data>
|
||||
<table id="info">
|
||||
<tr>
|
||||
<td width="17%">Date</td>
|
||||
<td width="40%">
|
||||
<span t-field="o.ordering_date" t-options="{ "widget": "date" }"/>
|
||||
</td>
|
||||
<td width="18%">Our Reference</td>
|
||||
<td width="25%">
|
||||
<span t-field="o.user_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Customer No.</td>
|
||||
<td>
|
||||
<span t-field="o.vendor_id.ref"/>
|
||||
</td>
|
||||
<td>Incoterm</td>
|
||||
<td>
|
||||
<span t-field="o.incoterm_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td/>
|
||||
<td>
|
||||
<span t-field="o.partner_ref"/>
|
||||
</td>
|
||||
<td>Agreement Deadline</td>
|
||||
<td>
|
||||
<span t-field="o.date_end" t-options="{ "widget": "date" }"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Reference</td>
|
||||
<td>
|
||||
<span t-field="o.comment"/>
|
||||
</td>
|
||||
<td/>
|
||||
<td/>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,11 +1,14 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale.report_blanketorder_document" priority="50">
|
||||
<xpath expr="//h2" position="after">
|
||||
<style>
|
||||
<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
|
||||
|
||||
<xpath expr="//h2" position="after">
|
||||
<style>
|
||||
table#info {
|
||||
width: 100%;
|
||||
margin-bottom: 25px;
|
||||
font-size: 9pt;
|
||||
font-family: arial;
|
||||
border-color: white;
|
||||
}
|
||||
table#info tr {
|
||||
line-height: 1.2;
|
||||
@@ -15,48 +18,49 @@
|
||||
font-size: 9pt;
|
||||
}
|
||||
</style>
|
||||
<table id="info">
|
||||
<tr>
|
||||
<td width="17%">Datum Angebot</td>
|
||||
<td width="44%">
|
||||
<span t-field="doc.date_confirmed" t-options="{ "widget": "date" }"/>
|
||||
</td>
|
||||
<td width="14%"/>
|
||||
<td width="25%"/>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Kunden-Nr.</td>
|
||||
<td>
|
||||
<span t-field="doc.partner_id.ref"/>
|
||||
</td>
|
||||
<td>U/Referenz</td>
|
||||
<td>
|
||||
<span t-field="doc.user_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>I/Referenz</td>
|
||||
<td>
|
||||
<span t-field="doc.client_order_ref"/>
|
||||
</td>
|
||||
<td>Versandart</td>
|
||||
<td>
|
||||
<span t-field="doc.carrier_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Betreff</td>
|
||||
<td>
|
||||
<span t-field="doc.comment"/>
|
||||
</td>
|
||||
<td>Lieferkondition</td>
|
||||
<td>
|
||||
<span t-field="doc.incoterm"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<t t-if="doc.note_header != '<p><br></p>'">
|
||||
<span class="note" t-field="doc.note_header"/>
|
||||
</t>
|
||||
</xpath>
|
||||
</data>
|
||||
<table id="info">
|
||||
<tr>
|
||||
<td width="17%">Date</td>
|
||||
<td width="40%">
|
||||
<span t-field="doc.date_confirmed" t-options="{ "widget": "date" }"/>
|
||||
</td>
|
||||
<td width="18%">Our Reference</td>
|
||||
<td width="25%">
|
||||
<span t-field="doc.user_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Customer No.</td>
|
||||
<td>
|
||||
<span t-field="doc.partner_id.ref"/>
|
||||
</td>
|
||||
<td>Delivery Method</td>
|
||||
<td>
|
||||
<span t-field="doc.carrier_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Order</td>
|
||||
<td>
|
||||
<span t-field="doc.client_order_ref"/>
|
||||
</td>
|
||||
<td>Incoterm</td>
|
||||
<td>
|
||||
<span t-field="doc.incoterm"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Reference</td>
|
||||
<td>
|
||||
<span t-field="doc.comment"/>
|
||||
</td>
|
||||
<td>Validity Date</td>
|
||||
<td>
|
||||
<span t-field="doc.validity_date"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,55 +1,62 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
|
||||
<xpath expr="//table[@id='summary']" position="after">
|
||||
<style>
|
||||
|
||||
<xpath expr="//table[@id='summary']" position="after">
|
||||
<style>
|
||||
table#footer {
|
||||
width: 100%;
|
||||
font-size: 8pt;
|
||||
line-height: 1.5;
|
||||
border-color: white;
|
||||
}
|
||||
table#footer tr, td {
|
||||
vertical-align: top;
|
||||
}
|
||||
</style>
|
||||
<table id="footer">
|
||||
<tr>
|
||||
<td width="40%" t-if="doc.payment_term_id.note">Payment terms
|
||||
<span t-field="doc.payment_term_id.note"/>
|
||||
<table id="footer">
|
||||
<tr>
|
||||
<td width="40%" t-if="doc.payment_term_id">
|
||||
<span>Zahlungsbedingungen </span>
|
||||
<span t-field="doc.payment_term_id"/>
|
||||
</td>
|
||||
<td width="60%">
|
||||
<td width="60%">
|
||||
Delivery according to our general delivery conditions
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>VAT no:
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<span>VAT no: </span>
|
||||
<span t-field="doc.company_id.vat"/>
|
||||
</td>
|
||||
<td>
|
||||
<table width="100%">
|
||||
<tr>
|
||||
<td width="35%">
|
||||
<td>
|
||||
<table width="100%">
|
||||
<tr>
|
||||
<td width="35%">
|
||||
Bank accounts:
|
||||
</td>
|
||||
<td width="65%">
|
||||
<td width="65%">
|
||||
UBS AG, 6301 Zug, BLZ 273, SWIFT UBSWCHZH80A
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
<td>
|
||||
(CHF) IBAN CH63 0027 3273 Q978 6962 0
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
<td>
|
||||
(EUR) IBAN CH59 0027 3273 HN10 3698 0
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</xpath>
|
||||
</data>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,7 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.report_delivery_document" priority="50">
|
||||
<xpath expr="//h2" position="after">
|
||||
<style>
|
||||
|
||||
<xpath expr="//h2" position="after">
|
||||
<style>
|
||||
.info_table tbody tr td:first-of-type {
|
||||
text-align: left;
|
||||
width: 5mm;
|
||||
@@ -10,47 +11,56 @@
|
||||
font-size: 9pt;
|
||||
}
|
||||
</style>
|
||||
<table id="infotable" class="info_table" style="width:100%; margin-bottom:25px; padding-left:0px; font-size:9pt; font-family:arial; color:black;">
|
||||
<tr style="line-height: 1.2">
|
||||
<td style="width:25mm;">Date</td>
|
||||
<td style="width:85mm;">
|
||||
<span t-field="o.date_done" t-options="{ "widget": "date" }"/>
|
||||
</td>
|
||||
<td style="width:25mm;">Order No.</td>
|
||||
<td style="width:45mm;">
|
||||
<span t-field="o.origin"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="line-height: 1.2">
|
||||
<td>Customer No.</td>
|
||||
<td>
|
||||
<span t-field="o.sale_id.partner_id.ref"/>
|
||||
</td>
|
||||
<td>Our Reference</td>
|
||||
<td>
|
||||
<span t-field="o.user_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="line-height: 1.2">
|
||||
<td>Order</td>
|
||||
<td>
|
||||
<span t-field="o.sale_id.client_order_ref"/>
|
||||
</td>
|
||||
<td>Delivery Method</td>
|
||||
<td>
|
||||
<span t-field="o.carrier_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="line-height: 1.2">
|
||||
<td>Reference</td>
|
||||
<td>
|
||||
<span t-field="o.sale_id.comment"/>
|
||||
</td>
|
||||
<td>Incoterm</td>
|
||||
<td>
|
||||
<span t-field="o.sale_id.incoterm"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</xpath>
|
||||
</data>
|
||||
|
||||
<table id="infotable" class="info_table" style="width:100%; margin-bottom:25px; padding-left:0px; font-size:9pt; font-family:arial; color:black; border-color: white;">
|
||||
|
||||
<tr style="line-height: 1.2">
|
||||
<td style="width:25mm;">Date</td>
|
||||
<td style="width:85mm;">
|
||||
<span t-field="o.date_done" t-options="{ "widget": "date" }"/>
|
||||
</td>
|
||||
<td style="width:25mm;">Order No.</td>
|
||||
<td style="width:45mm;">
|
||||
<span t-field="o.origin"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr style="line-height: 1.2">
|
||||
<td>Customer No.</td>
|
||||
<td>
|
||||
<span t-field="o.sale_id.partner_id.ref"/>
|
||||
</td>
|
||||
<td>Our Reference</td>
|
||||
<td>
|
||||
<span t-field="o.user_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr style="line-height: 1.2">
|
||||
<td>Order</td>
|
||||
<td>
|
||||
<span t-field="o.sale_id.client_order_ref"/>
|
||||
</td>
|
||||
|
||||
<td>Delivery Method</td>
|
||||
<td>
|
||||
<span t-field="o.carrier_id"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr style="line-height: 1.2">
|
||||
<td>Reference</td>
|
||||
<td>
|
||||
<span t-field="o.sale_id.comment"/>
|
||||
</td>
|
||||
<td>Incoterm</td>
|
||||
<td>
|
||||
<span t-field="o.sale_id.incoterm"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,3 +1,4 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.report_picking" priority="50">
|
||||
|
||||
<xpath expr="//div[hasclass('page')]" position="before">
|
||||
@@ -42,7 +43,7 @@
|
||||
<span t-field="ml.product_id.description_picking"/>
|
||||
</td>
|
||||
<td id="product_uom_qty">
|
||||
<span t-if="o.state != 'done'" t-field="ml.product_uom_qty"/>
|
||||
<span t-if="o.state != 'done'" t-field="ml.reserved_uom_qty"/>
|
||||
<span t-if="o.state == 'done'" t-field="ml.qty_done"/>
|
||||
<span t-field="ml.product_uom_id" groups="uom.group_uom"/>
|
||||
|
||||
@@ -84,4 +85,4 @@
|
||||
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
</data>
|
||||
@@ -1,77 +1,82 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.report_picking" priority="50">
|
||||
<xpath expr="//div[@name='div_origin']/.." position="replace">
|
||||
<style>
|
||||
table.trimada_order {
|
||||
width: 100%;
|
||||
font-size: 11pt;
|
||||
font-family: arial;
|
||||
}
|
||||
table.trimada_order tr {
|
||||
border-bottom: 1px solid rgb(220,220,220);
|
||||
}
|
||||
.first_col {
|
||||
width: 44%;
|
||||
padding-left: 10px;
|
||||
padding-top: 5px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
.second_col {
|
||||
width: 56%;
|
||||
}
|
||||
.last_row {
|
||||
border-bottom: 0px !important;
|
||||
}
|
||||
|
||||
<xpath expr="//div[@name='div_origin']/.." position="replace">
|
||||
|
||||
<style>
|
||||
table.trimada_order {
|
||||
width: 100%;
|
||||
font-size: 11pt;
|
||||
font-family: arial;
|
||||
border-color: white;
|
||||
}
|
||||
table.trimada_order tr {
|
||||
border-bottom: 1px solid rgb(220,220,220);
|
||||
}
|
||||
.first_col {
|
||||
width: 44%;
|
||||
padding-left: 10px;
|
||||
padding-top: 5px;
|
||||
padding-bottom: 5px;
|
||||
border-color: white;
|
||||
}
|
||||
.second_col {
|
||||
width: 56%;
|
||||
}
|
||||
.last_row {
|
||||
border-bottom: 0px !important;
|
||||
}
|
||||
</style>
|
||||
<table class="trimada_order">
|
||||
<tr>
|
||||
<t t-if="o.picking_type_id.id == 12">
|
||||
<td class="first_col">
|
||||
<strong>
|
||||
|
||||
<table class="trimada_order">
|
||||
<tr>
|
||||
<t t-if="o.picking_type_id.id == 12">
|
||||
<td class="first_col">
|
||||
<strong>
|
||||
Fertigungsauftrag
|
||||
<span t-field="o.origin"/>
|
||||
</strong>
|
||||
</td>
|
||||
<td class="second_col">
|
||||
<strong>
|
||||
</td>
|
||||
<td class="second_col">
|
||||
<strong>
|
||||
Produkt
|
||||
<span/>
|
||||
</strong>
|
||||
<span t-field="o.group_id.mrp_production_ids.product_id"/>
|
||||
</td>
|
||||
</t>
|
||||
<t t-if="o.picking_type_id.id != 12">
|
||||
<td class="first_col">
|
||||
<strong>
|
||||
<span t-field="o.group_id.mrp_production_ids.product_id"/>
|
||||
</td>
|
||||
</t>
|
||||
<t t-if="o.picking_type_id.id != 12">
|
||||
<td class="first_col">
|
||||
<strong>
|
||||
Bestellung
|
||||
<span t-field="o.origin"/>
|
||||
</strong>
|
||||
</td>
|
||||
<td/>
|
||||
</t>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="first_col">
|
||||
</td>
|
||||
<td/>
|
||||
</t>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="first_col">
|
||||
Status:
|
||||
<span t-field="o.state"/>
|
||||
</td>
|
||||
<td class="second_col">
|
||||
<td class="second_col">
|
||||
Datum:
|
||||
<span t-field="o.scheduled_date" t-options="{"widget": "date"}"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="last_row">
|
||||
<td class="first_col">
|
||||
</tr>
|
||||
<tr class="last_row">
|
||||
<td class="first_col">
|
||||
Typ:
|
||||
<span t-field="o.picking_type_id.code"/>
|
||||
</td>
|
||||
<t t-if="o.carrier_id">
|
||||
<td>
|
||||
<t t-if="o.carrier_id">
|
||||
<td>
|
||||
Auslieferungsmethode:
|
||||
<span t-field="o.carrier_id"/>
|
||||
</td>
|
||||
</t>
|
||||
</tr>
|
||||
</table>
|
||||
</xpath>
|
||||
</data>
|
||||
</t>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</xpath>
|
||||
</data>
|
||||
Reference in new issue
Block a user