sync from 14.0
This commit is contained in:
1 parent
5b667ce7ea
commit
b8680bee44
24 files changed
+378
-225
No files matched your search
@@ -20,6 +20,9 @@ FILE=`basename "$FILE_PATH"`
|
||||
# Copy from docker
|
||||
docker cp "$CONTAINER":"$FILE_PATH" .
|
||||
|
||||
# Check if already patched
|
||||
FOUND=$(grep "$FIND" $FILE)
|
||||
|
||||
# Find and replace
|
||||
sed -i'' "s/$FIND/$REPLACE/g" $FILE
|
||||
|
||||
@@ -29,6 +32,8 @@ docker cp $FILE "$CONTAINER":"$FILE_PATH"
|
||||
# Remove file
|
||||
rm -f $FILE
|
||||
|
||||
# Register patch installation
|
||||
echo "Patch $SCRIPT applied."
|
||||
touch "/etc/odoo/${SCRIPT}_${CONTAINER}_installed"
|
||||
if [ -z "$FOUND" ];then
|
||||
exit 0 # File is already patched
|
||||
else
|
||||
exit 2 # File changed
|
||||
fi
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0"?>
|
||||
<!-- Align invoice tax row right -->
|
||||
<data inherit_id="account.report_invoice_document" priority="50">
|
||||
|
||||
<xpath expr="//div[@t-field='o.partner_id']" position="replace">
|
||||
<div t-field="o.partner_invoice_id" t-options="{"widget": "contact", "fields": ["address", "name"], "no_marker": True}"/>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="hr.view_hr_job_form" priority="50">
|
||||
|
||||
<field name="description" position="attributes">
|
||||
<attribute name="widget">html</attribute>
|
||||
</field>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="hr_contract.hr_contract_view_kanban" priority="50">
|
||||
|
||||
<xpath expr="//field[@name='job_id']" position="after">
|
||||
<br/><field name="date_start"/>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -12,7 +12,6 @@
|
||||
<field name="copied" eval="True"/>
|
||||
<field name="ttype">boolean</field>
|
||||
<field name="website_form_blacklisted" eval="False"/>
|
||||
<field name="related">order_id.date_order</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -14,20 +14,22 @@
|
||||
<field name="ttype">int</field>
|
||||
<field name="depends">quantity_done</field>
|
||||
<field name="compute">for rec in self:
|
||||
if rec.product_packaging:
|
||||
if rec.product_packaging.name == "Schale Gross":
|
||||
rec['x_count_boxes'] = (rec.quantity_done/4 + 2.4)/2.5
|
||||
if rec.product_packaging.name == "Schale Klein":
|
||||
rec['x_count_boxes'] = (rec.quantity_done/6 + 0.9)/1
|
||||
if rec.product_packaging.name == "Vakuum":
|
||||
rec['x_count_boxes'] = (rec.quantity_done/8 + 0.9)/1
|
||||
if rec.product_packaging.name == "Kiste":
|
||||
if rec.product_id.id == 51:
|
||||
rec['x_count_boxes'] = (rec.product_uom_qty + 99)/100
|
||||
else:
|
||||
rec['x_count_boxes'] = (rec.product_uom_qty + 14)/15
|
||||
if rec.product_packaging.name in ["Karton"]:
|
||||
rec['x_count_boxes'] = 0</field>
|
||||
if rec.product_packaging:
|
||||
if rec.product_packaging.name == "Schale Gross":
|
||||
rec['x_count_boxes'] = (rec.quantity_done/4 + 2.4)/2.5
|
||||
if rec.product_packaging.name == "Schale Klein":
|
||||
rec['x_count_boxes'] = (rec.quantity_done/6 + 0.9)/1
|
||||
if rec.product_packaging.name == "Vakuum Gross":
|
||||
rec['x_count_boxes'] = (rec.quantity_done/4 + 2.4)/2.5
|
||||
if rec.product_packaging.name == "Vakuum Klein":
|
||||
rec['x_count_boxes'] = (rec.quantity_done/8 + 0.9)/1
|
||||
if rec.product_packaging.name == "Kiste":
|
||||
if rec.product_id.id == 51:
|
||||
rec['x_count_boxes'] = (rec.product_uom_qty + 99)/100
|
||||
else:
|
||||
rec['x_count_boxes'] = (rec.product_uom_qty + 14)/15
|
||||
if rec.product_packaging.name in ["Karton"]:
|
||||
rec['x_count_boxes'] = 0</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="l10n_ch.isr_invoice_form" priority="50">
|
||||
|
||||
<button name="print_ch_qr_bill" position="replace" />
|
||||
<button name="isr_print" position="replace" />
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="l10n_ch.l10n_ch_swissqr_template" priority="50">
|
||||
|
||||
<xpath expr="//t[@t-set='report_header_style']" position="replace">
|
||||
<t t-set="report_header_style">padding-top:6.2mm; padding-left:23mm; padding-right:8.2mm;</t>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,29 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="l10n_ch.l10n_ch_swissqr_template" priority="50">
|
||||
|
||||
<xpath expr="//h1" position="replace">
|
||||
<style>
|
||||
.trimada {
|
||||
font-size: 9pt;
|
||||
font-family: arial;
|
||||
color: black;
|
||||
margin-left: 25mm;
|
||||
}
|
||||
.name {
|
||||
font-size: 13pt;
|
||||
}
|
||||
</style>
|
||||
<div class="trimada">
|
||||
<span t-field="o.partner_invoice_id.name"/><br/>
|
||||
<span t-field="o.partner_invoice_id.street"> </span>
|
||||
<span t-field="o.partner_invoice_id.street2"/><br/>
|
||||
<span t-field="o.partner_invoice_id.country_id.code"/>
|
||||
<span t-field="o.partner_invoice_id.zip"/>
|
||||
<span t-field="o.partner_invoice_id.city"/><br/><br/><br/>
|
||||
<br/>
|
||||
</div>
|
||||
<span class="trimada name">Rechnung <t t-esc="o.name"/></span><br/>
|
||||
<span class="trimada">Rechnungsdatum: <t t-options="{"widget": "date"}" t-esc="o.invoice_date"/></span><br/>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,145 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale.report_saleorder_document" priority="50">
|
||||
|
||||
<!-- add default_code -->
|
||||
<xpath expr="//table/thead/tr/th[1]" position="after">
|
||||
<th>
|
||||
<span>Artikel Nr.</span>
|
||||
</th>
|
||||
</xpath>
|
||||
<xpath expr="//table/tbody/t/tr/t[1]/td[1]" position="after">
|
||||
<td>
|
||||
<span t-field="line.product_id.default_code"/>
|
||||
</td>
|
||||
</xpath>
|
||||
|
||||
<!-- replace product description -->
|
||||
<xpath expr="//table/tbody/t[2]/tr/t[1]/td[3]/span" position="replace">
|
||||
<t>
|
||||
<span style="font-weight:bold;" t-field="line.product_id.type_description"/>
|
||||
</t>
|
||||
</xpath>
|
||||
|
||||
<!-- add second row -->
|
||||
<xpath expr="//tbody//tr[1]" position="after">
|
||||
<tr>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td style="padding:0; padding-left:3px; line-height: 1.2" colspan="4">
|
||||
<span t-field="line.name"/>
|
||||
<br/>
|
||||
<t t-if="line.product_id.country_of_origin_id.code">Ursprungsland: <span t-field="line.product_id.country_of_origin_id.code"/>
|
||||
</t>
|
||||
<t t-if="line.product_id.hs_code"> / Zollposition: <span t-field="line.product_id.hs_code"/>
|
||||
</t>
|
||||
</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr style="border-bottom: 1px solid rgb(220,220,220)">
|
||||
<td colspan="8"></td>
|
||||
</tr>
|
||||
</xpath>
|
||||
|
||||
<!-- format main_table -->
|
||||
<xpath expr="//table[@class='table table-sm o_main_table']" position="attributes">
|
||||
<attribute name="style">width: 100%; font-size:9pt</attribute>
|
||||
<attribute name="class">table table-borderless table-sm</attribute>
|
||||
</xpath>
|
||||
|
||||
<!-- header-->
|
||||
<xpath expr="//table[@class='table table-borderless table-sm']/thead/tr" position="attributes">
|
||||
<attribute name="style">border-top:solid 1px; border-bottom: solid 1px; color: black;</attribute>
|
||||
</xpath>
|
||||
|
||||
<!-- header: position -->
|
||||
<xpath expr="//table[@class='table table-borderless table-sm']/thead/tr/th[1]" position="attributes">
|
||||
<attribute name="style">width: 5mm</attribute>/>
|
||||
</xpath>
|
||||
|
||||
<!-- header: default code -->
|
||||
<xpath expr="//table[@class='table table-borderless table-sm']/thead/tr/th[2]" position="attributes">
|
||||
<attribute name="style">width: 27mm; text-align: right; padding-right: 10px</attribute>"/>
|
||||
</xpath>
|
||||
|
||||
<!-- header: description -->
|
||||
<xpath expr="//table[@class='table table-borderless table-sm']/thead/tr/th[3]" position="attributes">
|
||||
<attribute name="style">width: 70mm</attribute>/>
|
||||
</xpath>
|
||||
|
||||
<!-- header: qty -->
|
||||
<xpath expr="//table[@class='table table-borderless table-sm']/thead/tr/th[5]" position="attributes">
|
||||
<attribute name="style">text-align: right; padding-right: 5px</attribute>"/>
|
||||
<attribute name="style">width: 30mm</attribute>/>
|
||||
</xpath>
|
||||
|
||||
<!-- position -->
|
||||
<xpath expr="//table[@class='table table-borderless table-sm']/tbody/t[2]/tr/t[1]/td[1]" position="attributes">
|
||||
<attribute name="style">text-align: right</attribute>/>
|
||||
</xpath>
|
||||
|
||||
<!-- default code -->
|
||||
<xpath expr="//table[@class='table table-borderless table-sm']/tbody/t[2]/tr/t[1]/td[2]" position="attributes">
|
||||
<attribute name="style">text-align: right; padding-right: 10px</attribute>/>
|
||||
</xpath>
|
||||
|
||||
<!-- commitment date -->
|
||||
<xpath expr="//table[@class='table table-borderless table-sm']/tbody/t[2]/tr/t[1]/td[4]" position="attributes">
|
||||
<attribute name="style">text-align: left;</attribute>/>
|
||||
</xpath>
|
||||
|
||||
<!-- qty -->
|
||||
<xpath expr="/t/t/div/table[2]/tbody/t[2]/tr[1]/t[1]/td[5]/span[1]" position="attributes">
|
||||
<attribute name="class" separator=" " add="o_bold"/>
|
||||
<attribute name="t-options-widget">"integer"</attribute>
|
||||
</xpath>
|
||||
|
||||
<!-- price -->
|
||||
<xpath expr="//table[@class='table table-borderless table-sm']/tbody/t[2]/tr/t[1]/td[7]/span" position="replace">
|
||||
<span t-esc="'%g' % line.price_unit if str(line.price_unit)[::-1].find('.') >= 3 else '%.2f' % line.price_unit"/>
|
||||
</xpath>
|
||||
|
||||
<!-- remove taxes -->
|
||||
<xpath expr="//thead/tr[1]/th[9]" position="replace"/>
|
||||
<xpath expr="//tbody/t[2]/tr[1]/t[1]/td[9]" position="replace"/>
|
||||
|
||||
<!-- margin -->
|
||||
<xpath expr="//table[@class='table table-borderless table-sm']/tbody/t[2]/tr/t[1]/td[8]/span" position="replace">
|
||||
<span t-field="line.discount"/>%
|
||||
</xpath>
|
||||
|
||||
<!-- total price -->
|
||||
<xpath expr="//table[@class='table table-borderless table-sm']/tbody[1]/t[2]/tr[1]/t[1]/td[9]/span" position="replace">
|
||||
<span t-esc="'{0:,.2f}'.format(int(line.price_subtotal)).replace(',','\'')"/>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[@class='table table-borderless table-sm']" position="after">
|
||||
<t t-if="doc.note_footer != '<p><br></p>'">
|
||||
<span class="note" t-field="doc.note_footer"/>
|
||||
</t>
|
||||
<table class="table table-borderless table-sm" style="margin-top:20px; width:100%; color:black; font-family: arial; font-size:9pt; border-top-style:solid; border-bottom-style:solid; border-width:1px; border-color:black">
|
||||
<t t-foreach="doc.amount_by_group" t-as="amount_by_group">
|
||||
<tr >
|
||||
<td style="width:15.5%; text-align:left">
|
||||
<Strong>Warenwert</Strong>
|
||||
</td>
|
||||
<td style="width:23%; text-align:left">
|
||||
<span t-field="doc.amount_untaxed"/>
|
||||
</td>
|
||||
<td style="width:12%; text-align:left">
|
||||
<span t-esc="amount_by_group[0]"/>
|
||||
</td>
|
||||
<td style="width:17%; text-align:left">
|
||||
<span t-esc="amount_by_group[1]" t-options="{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}"/>
|
||||
</td>
|
||||
<td style="width:14%; text-align:right">
|
||||
<Strong>Rechnungsbetrag</Strong>
|
||||
</td>
|
||||
<td style="width:18%; text-align:right">
|
||||
<span t-field="doc.amount_total"/>
|
||||
</td>
|
||||
</tr>
|
||||
</t>
|
||||
</table>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale.report_saleorder_document" priority="60">
|
||||
|
||||
<xpath expr="//table[2]//th[1]" position="attributes">
|
||||
<attribute name="id">position</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//table[2]//td[1]" position="attributes">
|
||||
<attribute name="id">position</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[2]//th[2]" position="attributes">
|
||||
<attribute name="id">description</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[2]//th[3]" position="attributes">
|
||||
<attribute name="id">quantity</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//table[2]//td[3]" position="attributes">
|
||||
<attribute name="id">quantity</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//table[2]//td[3]/span[1]" position="attributes">
|
||||
<attribute name="id">qty</attribute>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -8,29 +8,35 @@
|
||||
<t t-set="count_labels" t-value="0" />
|
||||
|
||||
<!-- Select loop based product packaing -->
|
||||
<t t-if="move.product_packaging.name == 'Schale Gross'">
|
||||
<t t-set="print_weight" t-value="False" />
|
||||
<t t-set="fix_weight">2'500g</t>
|
||||
<t t-set="count_boxes" t-value="move.x_count_boxes" />
|
||||
<t t-set="count_labels" t-value="move.quantity_done/2.5" />
|
||||
</t>
|
||||
<t t-if="move.product_packaging.name == 'Schale Klein'">
|
||||
<t t-set="print_weight" t-value="False" />
|
||||
<t t-set="fix_weight">1'000g</t>
|
||||
<t t-set="count_boxes" t-value="move.x_count_boxes" />
|
||||
<t t-set="count_labels" t-value="move.quantity_done" />
|
||||
</t>
|
||||
<t t-if="move.product_packaging.name == 'Schale Gross'">
|
||||
<t t-set="print_weight" t-value="False" />
|
||||
<t t-set="fix_weight">2'500g</t>
|
||||
<t t-set="count_boxes" t-value="move.x_count_boxes" />
|
||||
<t t-set="count_labels" t-value="move.quantity_done/2.5" />
|
||||
</t>
|
||||
<t t-if="move.product_packaging.name == 'Kiste'">
|
||||
<t t-set="print_weight" t-value="True" />
|
||||
<t t-set="count_boxes" t-value="move.x_count_boxes" />
|
||||
<t t-set="count_labels" t-value="0" />
|
||||
</t>
|
||||
<t t-if="move.product_packaging.name == 'Vakuum'">
|
||||
<t t-if="move.product_packaging.name == 'Vakuum Klein'">
|
||||
<t t-set="print_weight" t-value="False" />
|
||||
<t t-set="fix_weight">1'000g</t>
|
||||
<t t-set="count_boxes" t-value="0" />
|
||||
<t t-set="count_labels" t-value="move.quantity_done" />
|
||||
</t>
|
||||
<t t-if="move.product_packaging.name == 'Vakuum Gross'">
|
||||
<t t-set="print_weight" t-value="False" />
|
||||
<t t-set="fix_weight">2'500g</t>
|
||||
<t t-set="count_boxes" t-value="0" />
|
||||
<t t-set="count_labels" t-value="move.quantity_done" />
|
||||
</t>
|
||||
<t t-if="move.product_packaging.name == 'Karton'">
|
||||
<t t-set="print_weight" t-value="False" />
|
||||
<t t-set="fix_weight">5'000g</t>
|
||||
@@ -39,9 +45,9 @@
|
||||
</t>
|
||||
|
||||
<!-- <p>Name: <span t-esc="move.product_id.name"/></p> -->
|
||||
<!-- <p>Boxes: <span t-esc="count_boxes"/></p>
|
||||
<p>Labels: <span t-esc="count_labels"/></p>
|
||||
<p>Moves Lines: <span t-esc="len(move.move_line_ids)"/></p> -->
|
||||
<!--<p>Boxes: <span t-esc="count_boxes"/></p>-->
|
||||
<!--<p>Labels: <span t-esc="count_labels"/></p>-->
|
||||
<!--<p>Moves Lines: <span t-esc="len(move.move_line_ids)"/></p>-->
|
||||
|
||||
<t t-foreach="move.move_line_ids.filtered(lambda l: l.qty_done > 0)" t-as="move_line">
|
||||
<t t-foreach="range(0, int(count_labels + count_boxes))" t-as="page">
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.report_delivery_document" priority="50">
|
||||
|
||||
<xpath expr="//table[@id='infotable']" position="after">
|
||||
<t t-if="o.note_header != '<p><br></p>'">
|
||||
<span class="note" t-field="o.note_header"/>
|
||||
</t>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[2]" position="after">
|
||||
<t t-if="o.note_footer != '<p><br></p>'">
|
||||
<span class="note" t-field="o.note_footer"/>
|
||||
</t>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,8 +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,46 +10,57 @@
|
||||
.note {
|
||||
font-size: 9pt;
|
||||
}
|
||||
</style>
|
||||
|
||||
<table class="info_table" style="width:100%; margin-bottom:25px; padding-left:0px; font-size:9pt; font-family:arial; color:black;">
|
||||
</style>
|
||||
|
||||
<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.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 id="infotable" class="info_table" style="width:100%; margin-bottom:25px; padding-left:0px; font-size:9pt; font-family:arial; color:black;">
|
||||
|
||||
</table>
|
||||
<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>
|
||||
|
||||
<t t-if="o.note_header != '<p><br></p>'">
|
||||
<span class="note" t-field="o.note_header"/>
|
||||
</t>
|
||||
|
||||
|
||||
</xpath>
|
||||
<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>
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.report_delivery_document" priority="50">
|
||||
|
||||
<xpath expr="//table[@name='stock_backorder_table']/thead/tr/th[2]" position="after">
|
||||
<th>
|
||||
<strong>Open Quantity</strong>
|
||||
</th>
|
||||
</xpath>
|
||||
<xpath expr="//table[@name='stock_backorder_table']/tbody//td[3]" position="after">
|
||||
<th>
|
||||
</th>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.report_delivery_document" priority="50">
|
||||
|
||||
<xpath expr="//table[@name='stock_backorder_table']/thead//th[4]" position="replace">
|
||||
<th></th>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,13 +1,12 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.report_delivery_document" priority="50">
|
||||
|
||||
<xpath expr="//table[@name='stock_move_table']/tbody/tr/td[2]" position="replace">
|
||||
<xpath expr="//table[@name='stock_move_table']/tbody/tr/td[1]" position="replace">
|
||||
<td>
|
||||
<t t-if="move.product_id.type_description">
|
||||
<strong><span t-field="move.product_id.type_description"/></strong><br/>
|
||||
</t>
|
||||
<span t-field="move.description_picking"/>
|
||||
<span t-field="move.product_id.name"/><br/>
|
||||
<span t-field="move.description_picking"/><br/>
|
||||
<t t-if="move.product_id.country_of_origin_id.code">Ursprungsland: <span t-field="move.product_id.country_of_origin_id.code"/></t>
|
||||
<t t-if="move.product_id.hs_code"> / Zollposition: <span t-field="move.product_id.hs_code"/></t>
|
||||
</td>
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.report_delivery_document" priority="60">
|
||||
|
||||
<xpath expr="//span[@t-field='move.product_uom_qty']" position="replace">
|
||||
<span t-field="move.quantity_done"/>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,8 +1,58 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.report_delivery_document" priority="50">>
|
||||
<data inherit_id="stock.report_delivery_document" priority="60">
|
||||
|
||||
<xpath expr="//table[@name='stock_move_table']//th[1]" position="attributes">
|
||||
<attribute name="id">product_id</attribute>
|
||||
<attribute name="id">position</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//table[@name='stock_move_table']//td[1]" position="attributes">
|
||||
<attribute name="id">position</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[@name='stock_move_table']//th[2]" position="attributes">
|
||||
<attribute name="id">description</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[@name='stock_move_table']//th[3]" position="attributes">
|
||||
<attribute name="id">quantity</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//table[@name='stock_move_table']//td[3]" position="attributes">
|
||||
<attribute name="id">quantity</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//table[@name='stock_move_table']//td[3]/span[1]" position="attributes">
|
||||
<attribute name="id">qty</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[@name='stock_backorder_table']//th[1]" position="attributes">
|
||||
<attribute name="id">position</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//table[@name='stock_backorder_table']//td[1]" position="attributes">
|
||||
<attribute name="id">position</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[@name='stock_backorder_table']//th[2]" position="attributes">
|
||||
<attribute name="id">description</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[@name='stock_backorder_table']//th[3]" position="attributes">
|
||||
<attribute name="id">open_quantity</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//table[@name='stock_backorder_table']//td[3]" position="attributes">
|
||||
<attribute name="id">open_quantity</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[@name='stock_backorder_table']//th[3]" position="attributes">
|
||||
<attribute name="id">open_quantity</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//table[@name='stock_backorder_table']//td[3]/span[1]" position="attributes">
|
||||
<attribute name="id">open_qty</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[@name='stock_backorder_table']//th[4]" position="attributes">
|
||||
<attribute name="id">quantity</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[@name='stock_backorder_table']/../p" position="attributes">
|
||||
<attribute name="class">subtitel</attribute>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.report_delivery_document" priority="50">
|
||||
|
||||
<xpath expr="//table[@name='stock_move_table']/thead/tr/th[1]" position="before">
|
||||
<th id="default_code">
|
||||
<strong >Part No.</strong>
|
||||
</th>
|
||||
</xpath>
|
||||
<xpath expr="//table[@name='stock_backorder_table']/thead/tr/th[1]" position="before">
|
||||
<th id="default_code">
|
||||
<strong >Part No.</strong>
|
||||
</th>
|
||||
</xpath>
|
||||
<xpath expr="//table[@name='stock_move_table']/tbody//tr/td[1]" position="before">
|
||||
<td id="default_code">
|
||||
<span t-field="move.product_id.default_code"/>
|
||||
</td>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -1,12 +1,16 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.report_delivery_document" priority="60">
|
||||
<data inherit_id="stock.report_delivery_document" priority="50">
|
||||
|
||||
<xpath expr="//table[@name='stock_move_table']/tbody/t" position="after">
|
||||
<t t-set="lines" t-value="lines.sorted(key=lambda l: (l.position))"/>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//table[@name='stock_backorder_table']/tbody/t/t" position="after">
|
||||
<t t-set="bo_lines" t-value="bo_lines.sorted(key=lambda l: (l.position))"/>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//t[@name='no_package_move_lines']" position="before">
|
||||
<t t-set="move_lines" t-value="move_lines.sorted(key=lambda l: (l.position))"/>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
</data>
|
||||
@@ -1,25 +1,79 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.report_delivery_document" priority="60">
|
||||
|
||||
<xpath expr="//div[hasclass('page')]" position="before">
|
||||
<xpath expr="//div[hasclass('page')]" position="before">
|
||||
<style>
|
||||
table.trimada {
|
||||
font-size: 9pt;
|
||||
font-family: arial;
|
||||
color: black;
|
||||
}
|
||||
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 tr {
|
||||
border-bottom: 1px solid rgb(220,220,220)
|
||||
}
|
||||
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>
|
||||
|
||||
<table name="stock_move_table" position="attributes">
|
||||
<attribute name="class" separator=" " add="trimada"/>
|
||||
<attribute name="class" separator=" " add="trimada table-borderless"/>
|
||||
</table>
|
||||
|
||||
<table name="stock_backorder_table" position="attributes">
|
||||
<attribute name="class" separator=" " add="trimada"/>
|
||||
<attribute name="class" separator=" " add="trimada table-borderless"/>
|
||||
</table>
|
||||
|
||||
<span id="open_qty" position="attributes">
|
||||
<attribute name="t-options-widget">"integer"</attribute>
|
||||
</span>
|
||||
|
||||
<span id="qty" position="attributes">
|
||||
<attribute name="t-options-widget">"integer"</attribute>
|
||||
</span>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="stock.view_move_form" priority="50">
|
||||
|
||||
<field name="name" position="before">
|
||||
<field name="product_packaging"/>
|
||||
</field>
|
||||
|
||||
</data>
|
||||
@@ -2,7 +2,7 @@
|
||||
<data inherit_id="web.external_layout_standard" priority="50">
|
||||
|
||||
<xpath expr="/t/div" position="replace">
|
||||
<div t-attf-class="header o_company_#{company.id}_layout">
|
||||
<div t-attf-class="header o_company_#{company.id}_layout" t-att-style="report_header_style">
|
||||
|
||||
<table style="width:100%; font-size: 9pt; color:rgb(102,102,102); font-family:arial;">
|
||||
|
||||
|
||||
Reference in new issue
Block a user