sync
This commit is contained in:
1 parent
17d212ac5d
commit
e1d90d41e2
12 files changed
+234
-17
No files matched your search
+1
-2
@@ -12,7 +12,7 @@ services:
|
||||
ports:
|
||||
- "127.0.0.1:8069:8069"
|
||||
volumes:
|
||||
- odoo-data:/var/lib/odoo
|
||||
- $HOME/.local/share/Odoo/filestore:/var/lib/odoo/filestore
|
||||
- ./config:/etc/odoo
|
||||
- ./addons:/mnt/addons
|
||||
- ./oca:/mnt/oca
|
||||
@@ -74,7 +74,6 @@ services:
|
||||
volumes:
|
||||
- cd-data:/var/jenkins_home
|
||||
volumes:
|
||||
odoo-data:
|
||||
db-data:
|
||||
admin-data:
|
||||
mail-data:
|
||||
|
||||
@@ -2265,6 +2265,14 @@ ID: `mint_system.account.report_invoice_document.style_tissa`
|
||||
<attribute name="t-attf-class">text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//p[@name='payment_communication']" position="attributes">
|
||||
<attribute name="style">margin-bottom: 0px</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//p[@name='payment_term']" position="attributes">
|
||||
<attribute name="style">margin-bottom: 0px</attribute>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
|
||||
```
|
||||
@@ -4831,6 +4839,14 @@ ID: `mint_system.account.report_invoice_document.style_tissa`
|
||||
<attribute name="t-attf-class">text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//p[@name='payment_communication']" position="attributes">
|
||||
<attribute name="style">margin-bottom: 0px</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//p[@name='payment_term']" position="attributes">
|
||||
<attribute name="style">margin-bottom: 0px</attribute>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
|
||||
```
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="account.report_invoice_document" priority="50">
|
||||
|
||||
<xpath expr="//span[@t-field='line.price_unit']" position="replace">
|
||||
<span class="text-nowrap" t-esc="'{0:,.2f}'.format(float(line.price_unit)).replace(',','\'')"/>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -27,4 +27,12 @@
|
||||
<attribute name="t-attf-class">text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//p[@name='payment_communication']" position="attributes">
|
||||
<attribute name="style">margin-bottom: 0px</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//p[@name='payment_term']" position="attributes">
|
||||
<attribute name="style">margin-bottom: 0px</attribute>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -411,6 +411,21 @@ ID: `mint_system.base.view_partner_form.x_external_ref`
|
||||
```
|
||||
Source: [snippets/base.view_partner_form.x_external_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_external_ref.xml)
|
||||
|
||||
### X Global Location Number
|
||||
ID: `mint_system.base.view_partner_form.x_global_location_number`
|
||||
```xml
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="base.view_partner_form" priority="50">
|
||||
|
||||
<xpath expr="//field[@name='vat']" position="after">
|
||||
<field name="x_global_location_number"/>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
|
||||
```
|
||||
Source: [snippets/base.view_partner_form.x_global_location_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_global_location_number.xml)
|
||||
|
||||
### X Packaging Ref
|
||||
ID: `mint_system.base.view_partner_form.x_packaging_ref`
|
||||
```xml
|
||||
@@ -426,6 +441,21 @@ ID: `mint_system.base.view_partner_form.x_packaging_ref`
|
||||
```
|
||||
Source: [snippets/base.view_partner_form.x_packaging_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_packaging_ref.xml)
|
||||
|
||||
### X Vst
|
||||
ID: `mint_system.base.view_partner_form.x_vst`
|
||||
```xml
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="base.view_partner_form" priority="50">
|
||||
|
||||
<xpath expr="//field[@name='vat']" position="after">
|
||||
<field name="x_vst"/>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
|
||||
```
|
||||
Source: [snippets/base.view_partner_form.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_vst.xml)
|
||||
|
||||
## View Partner Tree
|
||||
### Add Ref Zip Type
|
||||
ID: `mint_system.base.view_partner_tree.add_ref_zip_type`
|
||||
|
||||
@@ -1686,6 +1686,28 @@ ID: `mint_system.ir_model.res_partner.x_external_ref`
|
||||
```
|
||||
Source: [snippets/ir_model.res_partner.x_external_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_external_ref.xml)
|
||||
|
||||
### X Global Location Number
|
||||
ID: `mint_system.ir_model.res_partner.x_global_location_number`
|
||||
```xml
|
||||
<?xml version='1.0' encoding='UTF-8' ?>
|
||||
<odoo>
|
||||
|
||||
<record id="x_global_location_number" model="ir.model.fields">
|
||||
<field name="domain">[]</field>
|
||||
<field name="field_description">VSTGLN</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="model_id" ref="base.model_res_partner"/>
|
||||
<field name="name">x_global_location_number</field>
|
||||
<field name="store" eval="True"/>
|
||||
<field name="readonly" eval="False"/>
|
||||
<field name="copied" eval="False"/>
|
||||
<field name="ttype">char</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
```
|
||||
Source: [snippets/ir_model.res_partner.x_global_location_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_global_location_number.xml)
|
||||
|
||||
### X Packaging Ref
|
||||
ID: `mint_system.ir_model.res_partner.x_packaging_ref`
|
||||
```xml
|
||||
@@ -1732,6 +1754,28 @@ ID: `mint_system.ir_model.res_partner.x_stock_move_ids`
|
||||
```
|
||||
Source: [snippets/ir_model.res_partner.x_stock_move_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_stock_move_ids.xml)
|
||||
|
||||
### X Vst
|
||||
ID: `mint_system.ir_model.res_partner.x_vst`
|
||||
```xml
|
||||
<?xml version='1.0' encoding='UTF-8' ?>
|
||||
<odoo>
|
||||
|
||||
<record id="x_vst" model="ir.model.fields">
|
||||
<field name="domain">[]</field>
|
||||
<field name="field_description">VST</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="model_id" ref="base.model_res_partner"/>
|
||||
<field name="name">x_vst</field>
|
||||
<field name="store" eval="True"/>
|
||||
<field name="readonly" eval="False"/>
|
||||
<field name="copied" eval="False"/>
|
||||
<field name="ttype">char</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
```
|
||||
Source: [snippets/ir_model.res_partner.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_vst.xml)
|
||||
|
||||
## Sale Blanket Order Line
|
||||
### X Product Uom Category Id
|
||||
ID: `mint_system.ir_model.sale_blanket_order_line.x_product_uom_category_id`
|
||||
@@ -2141,6 +2185,28 @@ ID: `mint_system.ir_model.sale_order.x_incoterm_blanket_order`
|
||||
```
|
||||
Source: [snippets/ir_model.sale_order.x_incoterm_blanket_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_incoterm_blanket_order.xml)
|
||||
|
||||
### X Order Number
|
||||
ID: `mint_system.ir_model.sale_order.x_order_number`
|
||||
```xml
|
||||
<?xml version='1.0' encoding='UTF-8' ?>
|
||||
<odoo>
|
||||
|
||||
<record id="x_order_number" model="ir.model.fields">
|
||||
<field name="field_description">Bestellnummer Kunde</field>
|
||||
<field name="model">sale.order</field>
|
||||
<field name="model_id" ref="sale.model_sale_order"/>
|
||||
<field name="name">x_order_number</field>
|
||||
<field name="store" eval="True"/>
|
||||
<field name="readonly" eval="False"/>
|
||||
<field name="copied" eval="True"/>
|
||||
<field name="ttype">Char</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
|
||||
```
|
||||
Source: [snippets/ir_model.sale_order.x_order_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_order_number.xml)
|
||||
|
||||
### X Product Uom Qty
|
||||
ID: `mint_system.ir_model.sale_order.x_product_uom_qty`
|
||||
```xml
|
||||
|
||||
@@ -3788,6 +3788,20 @@ ID: `mint_system.sale.view_order_form.x_margin_percent`
|
||||
```
|
||||
Source: [snippets/sale.view_order_form.x_margin_percent.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_margin_percent.xml)
|
||||
|
||||
### X Order Number
|
||||
ID: `mint_system.sale.view_order_form.x_order_number`
|
||||
```xml
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale.view_order_form" priority="50">
|
||||
|
||||
<xpath expr="//page[@name='other_information']//field[@name='client_order_ref']" position="after">
|
||||
<field name="x_order_number"/>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
```
|
||||
Source: [snippets/sale.view_order_form.x_order_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_order_number.xml)
|
||||
|
||||
### X Sudio Description
|
||||
ID: `mint_system.sale.view_order_form.x_sudio_description`
|
||||
```xml
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale.view_order_form" priority="50">
|
||||
|
||||
<xpath expr="//page[@name='other_information']//field[@name='client_order_ref']" position="after">
|
||||
<field name="x_order_number"/>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -438,6 +438,27 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.remove_vat`
|
||||
```
|
||||
Source: [snippets/sale_blanket_order.report_blanketorder_document.remove_vat.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.remove_vat.xml)
|
||||
|
||||
### Replace Address Block
|
||||
ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_address_block`
|
||||
```xml
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">>
|
||||
|
||||
<xpath expr="//div[@t-field='doc.partner_id']/../.." position="replace">
|
||||
<div class="row">
|
||||
<div class="col-7"></div>
|
||||
<div class="col-5">
|
||||
<div t-field="doc.partner_id" t-options="{"widget": "contact", "fields": ["address", "name", "fax"], "no_marker": True, "phone_icons": True}"/>
|
||||
<p t-if="doc.partner_id.vat">VAT: <span t-field="doc.partner_id.vat"/>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
```
|
||||
Source: [snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml)
|
||||
|
||||
### Replace Infoblock
|
||||
ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_infoblock`
|
||||
```xml
|
||||
@@ -810,16 +831,33 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.style_tissa`
|
||||
|
||||
<xpath expr="//div[hasclass('page')]" position="before">
|
||||
<style>
|
||||
.trimada {
|
||||
margin-bottom: 20px;
|
||||
table#info {
|
||||
font-size: 9pt;
|
||||
font-family: arial;
|
||||
}
|
||||
h2 {
|
||||
font-size: 1.2rem;
|
||||
font-weight: bold;
|
||||
margin: 50px 0 30px 0
|
||||
}
|
||||
body {
|
||||
font-size: 11pt;
|
||||
font-family: arial;
|
||||
}
|
||||
.table th {
|
||||
padding: 0.2rem;
|
||||
padding-left: 0.5rem;
|
||||
}
|
||||
.note p {
|
||||
font-family: arial;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
.note p:last-child {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
</style>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//div[@id='address']/div" position="attributes">
|
||||
<attribute name="class">col-4</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//div[@id='summary']/div" position="attributes">
|
||||
<attribute name="t-attf-class">#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto</attribute>
|
||||
</xpath>
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">>
|
||||
|
||||
<xpath expr="//div[@t-field='doc.partner_id']/../.." position="replace">
|
||||
<div class="row">
|
||||
<div class="col-7"></div>
|
||||
<div class="col-5">
|
||||
<div t-field="doc.partner_id" t-options="{"widget": "contact", "fields": ["address", "name", "fax"], "no_marker": True, "phone_icons": True}"/>
|
||||
<p t-if="doc.partner_id.vat">VAT: <span t-field="doc.partner_id.vat"/>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -3,16 +3,33 @@
|
||||
|
||||
<xpath expr="//div[hasclass('page')]" position="before">
|
||||
<style>
|
||||
.trimada {
|
||||
margin-bottom: 20px;
|
||||
table#info {
|
||||
font-size: 9pt;
|
||||
font-family: arial;
|
||||
}
|
||||
h2 {
|
||||
font-size: 1.2rem;
|
||||
font-weight: bold;
|
||||
margin: 50px 0 30px 0
|
||||
}
|
||||
body {
|
||||
font-size: 11pt;
|
||||
font-family: arial;
|
||||
}
|
||||
.table th {
|
||||
padding: 0.2rem;
|
||||
padding-left: 0.5rem;
|
||||
}
|
||||
.note p {
|
||||
font-family: arial;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
.note p:last-child {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
</style>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//div[@id='address']/div" position="attributes">
|
||||
<attribute name="class">col-4</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//div[@id='summary']/div" position="attributes">
|
||||
<attribute name="t-attf-class">#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto</attribute>
|
||||
</xpath>
|
||||
|
||||
+1
-3
@@ -3177,9 +3177,7 @@ ID: `mint_system.stock.report_delivery_document.title_supplement`
|
||||
<data inherit_id="stock.report_delivery_document" priority="50">
|
||||
|
||||
<xpath expr="//h2" position="replace">
|
||||
<h2>
|
||||
Delivery Slip <span t-field="o.name"/>
|
||||
</h2>
|
||||
<h2>Delivery Slip <span t-field="o.name"/></h2>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
|
||||
Reference in new issue
Block a user