mint-systems/Odoo-Build
3
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '16.0' of github.com:Mint-System/Odoo-Build into 16.0

Browse Source
This commit is contained in:
Janik von Rotz committed 2024-12-16 09:29:39 +01:00
2 parents dd1ed31c86 3600b6686f
commit d030e03398
11 files changed
+125 -69
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

snippets/account.report_invoice_document.add_iban.xml
+16 -4
View File
@@ -1,6 +1,18 @@
<?xml version="1.0"?>
<data inherit_id="account.report_invoice_document" priority="50">
<!-- Odoo 17.0 -->
<xpath expr="//span[@id='payment_terms_note_id']/.." position="after">
<div class="row">
<div class="col">
<span>IBAN: </span>
<span t-field="o.partner_bank_id.acc_number"/>
</div>
</div>
</xpath>
<!-- Odoo 14.0 -->
<!--
<xpath expr="/t/t/div/p[2]" position="before">
<t t-if="not o.partner_bank_id._eligible_for_qr_code('ch_qr', o.partner_id, o.currency_id)">
<p>
@@ -15,7 +27,7 @@
</b>
</p>
</t>
</xpath>
</xpath> -->
<!-- Odoo 13.0 -->
<!-- <xpath expr="/t/t/div/p[2]" position="after">
<div class="row">
@@ -24,8 +36,8 @@
<span t-field="o.invoice_partner_bank_id.acc_number"/>
</div>
</div>
</xpath>
<xpath expr="/t/t/div/div[3]" position="after">
</xpath>
<xpath expr="/t/t/div/div[3]" position="after">
<div class="row">
<div class="col">
<span>Bank/BIC: </span>
@@ -34,5 +46,5 @@
<br/>
</div>
</div>
</xpath> -->
</xpath> -->
</data>
snippets/l10n_ch.l10n_ch_swissqr_template.replace_title.xml
+15 -13
View File
@@ -1,25 +1,27 @@
<?xml version="1.0"?>
<data inherit_id="l10n_ch.l10n_ch_swissqr_template" priority="50">
<xpath expr="//h1" position="replace">
<style>
<xpath expr="//div[@class='swissqr_content_v2']" position="after">
<style>
.trimada {
font-size: 9pt;
font-family: arial;
color: black;
margin-left: 25mm;
width: 200mm;
padding-top: 50mm;
}
.name {
font-size: 13pt;
}
</style>
<div class="trimada" t-field="o.partner_invoice_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
<br/>
<br/>
<br/>
<span class="trimada name">Rechnung <t t-esc="o.name"/></span>
<br/>
<span class="trimada">Rechnungsdatum: <t t-options="{&quot;widget&quot;: &quot;date&quot;}" t-esc="o.invoice_date"/></span>
<br/>
</xpath>
<div class="trimada" t-field="o.partner_invoice_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
<br/>
<br/>
<br/>
<span class="trimada name">Rechnung <t t-esc="o.name"/></span>
<br/>
<span class="trimada">Rechnungsdatum: <t t-options="{&quot;widget&quot;: &quot;date&quot;}" t-esc="o.invoice_date"/></span>
<br/>
</xpath>
</data>
snippets/purchase.report_purchaseorder_document.append_payment_terms.xml
+12 -12
View File
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<data inherit_id="purchase.report_purchaseorder_document" priority="50">
<xpath expr="/t/t/div/div[4]" position="after">
<div class="row">
<div class="col">
<t t-if="o.payment_term_id" name="payment_term">
<strong>Payment Terms: </strong>
<span t-field="o.payment_term_id.name"/>
</t>
</div>
</div>
</xpath>
<data inherit_id="purchase.report_purchaseorder_document">
<xpath expr="//div[@id='total']" position="after">
<div class="row" style="margin-top: 1rem; margin-bottom: 1rem">
<div class="col">
<t t-if="o.payment_term_id" name="payment_term">
<strong>Payment Terms: </strong><span t-field="o.payment_term_id.name"/>
</t>
</div>
</div>
</xpath>
</data>
snippets/purchase.report_purchaseorder_document.format_title.xml
+9 -7
View File
@@ -1,14 +1,16 @@
<?xml version="1.0"?>
<data inherit_id="purchase.report_purchaseorder_document" priority="50">
<data inherit_id="purchase.report_purchaseorder_document" priority="50">>
<xpath expr="//h2[1]" position="attributes">
<attribute name="style">color: black; font-size:13pt; font-weight:bold; margin-top:10mm; margin-bottom:3mm</attribute>
<xpath expr="//div/h2[1]" position="attributes">
<attribute name="style">color: black; margin-top: 2rem</attribute>
</xpath>
<xpath expr="//h2[2]" position="attributes">
<attribute name="style">color: black; font-size:13pt; font-weight:bold; margin-top:10mm; margin-bottom:3mm</attribute>
<xpath expr="//div/h2[2]" position="attributes">
<attribute name="style">color: black; margin-top: 2rem</attribute>
</xpath>
<xpath expr="//h2[3]" position="attributes">
<attribute name="style">color: black; font-size:13pt; font-weight:bold; margin-top:10mm; margin-bottom:3mm</attribute>
<xpath expr="//div/h2[3]" position="attributes">
<attribute name="style">color: black; margin-top: 2rem</attribute>
</xpath>
</data>
snippets/purchase.report_purchaseorder_document.replace_representative.xml
+7 -6
View File
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<data inherit_id="purchase.report_purchaseorder_document" priority="50">
<xpath expr="/t[1]/t[1]/div[1]/div[2]/div[1]/p[1]" position="replace">
<span t-field="o.user_id.email"/>
</xpath>
</data>
<data inherit_id="purchase.report_purchaseorder_document">
<xpath expr="//div[@id='informations']//p[@t-field='o.user_id']" position="replace">
<p t-field="o.user_id.email"/>
</xpath>
</data>
snippets/purchase.report_purchasequotation_document.add_infoblock.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0"?>
<data inherit_id="purchase.report_purchasequotation_document" priority="50">
<xpath expr="//div[@id='informations']" position="replace">
<div id="informations" class="row mt32 mb32">
<div t-if="o.user_id" class="col-3 bm-2">
<strong>Ansprechperson Einkauf</strong>
<p t-field="o.user_id.email" class="m-0"/>
</div>
<div t-if="o.partner_ref" class="col-3 bm-2">
<strong>Ihre Referenz</strong>
<p t-field="o.partner_ref" class="m-0"/>
</div>
<div t-if="o.date_order" class="col-3 bm-2">
<strong>Frist für Angebotsabgabe</strong>
<p t-field="o.date_order" class="m-0" t-options="{ &quot;widget&quot;: &quot;date&quot; }"/>
</div>
<div t-if="o.incoterm_id" class="col-3 bm-2">
<strong>Incoterm</strong>
<p t-field="o.incoterm_id.code" class="m-0"/>
</div>
</div>
</xpath>
</data>
snippets/sale.report_saleorder_document.add_partner_contact_id.xml
-9
View File
@@ -1,9 +0,0 @@
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="50">
<xpath expr="//div[@id='informations']//p[@t-field='doc.client_order_ref']/.." position="after">
<div t-if="doc.partner_contact_id.name and doc.partner_contact_id.parent_id" class="col-auto col-3 mw-100 mb-2">
<strong>Contact</strong>
<p t-field="doc.partner_contact_id.name"/>
</div>
</xpath>
</data>
snippets/sale.report_saleorder_document.add_partner_sale_id.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="50">
<xpath expr="//div[@id='informations']//span[@t-field='doc.client_order_ref']/.." position="after">
<div t-if="doc.partner_sale_id.name and doc.partner_sale_id.parent_id" class="col-auto col-3 mw-100 mb-2">
<strong>Contact</strong>
<p t-field="doc.partner_sale_id.name"/>
</div>
</xpath>
</data>
snippets/sale.report_saleorder_document.append_payment_terms.xml
+16 -10
View File
@@ -1,11 +1,17 @@
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="50">
<xpath expr="/t/t/div/div[6]" position="after">
<div class="row">
<div class="col">
<strong>Zahlungsbedingungen: </strong>
<span t-field="doc.payment_term_id.name"/>
</div>
</div>
</xpath>
<data inherit_id="sale.report_saleorder_document">
<xpath expr="//div/span[@t-field='doc.note']/.." position="before">
<div class="row" style="margin-top: 1rem; margin-bottom: 1rem">
<div class="col">
<strong>Zahlungsbedingungen: </strong>
<t t-if="doc.x_payment_term_blanket_order">
<span t-field="doc.x_payment_term_blanket_order"/>
</t>
<t t-if="not doc.x_payment_term_blanket_order">
<span t-field="doc.payment_term_id.name"/>
</t>
</div>
</div>
</xpath>
</data>
snippets/sale.report_saleorder_document.set_ids.xml
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="50">
<xpath expr="//div[@id='informations']//p[@t-field='doc.incoterm.code']/.." position="attributes">
<xpath expr="//div[@id='informations']//span[@t-field='doc.incoterm.code']/.." position="attributes">
<attribute name="id">incoterm</attribute>
</xpath>
<xpath expr="//div[@id='informations']//p[@t-field='doc.date_order']" position="attributes">
<xpath expr="//div[@id='informations']//span[@t-field='doc.date_order']" position="attributes">
<attribute name="id">date_order</attribute>
</xpath>
<xpath expr="//th[@name='th_description']" position="attributes">
snippets/sale.report_saleorder_document.style_gelso.xml
+13 -6
View File
@@ -1,9 +1,16 @@
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="60">
<xpath expr="//div[@id='incoterm']" position="attributes">
<attribute name="class" separator=" " add="col-auto col-3 mw-100 mb-2"/>
<xpath expr="//div[hasclass('page')]" position="before">
<style>
.mt-4 {
margin-top: 0rem !important;
}
</style>
</xpath>
<xpath expr="//p[@id='date_order']" position="attributes">
<attribute name="t-options-widget">"date"</attribute>
<xpath expr="//h2" position="attributes">
<attribute name="class"/>
<attribute name="style">margin-top: 2rem</attribute>
</xpath>
</data>
</data>