sync from 15.0

This commit is contained in:
janikvonrotz committed 2023-02-02 10:23:25 +01:00
1 parent 632fd39bcc
commit ab76b2e3bb
20 files changed
+306 -50

No files matched your search

+15
View File
@@ -181,6 +181,21 @@ ID: `mint_system.base.view_company_form.show_account_onboarding_panel`
```
Source: [snippets/base.view_company_form.show_account_onboarding_panel.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/base.view_company_form.show_account_onboarding_panel.xml)
### Show Analytic Plan Id
ID: `mint_system.base.view_company_form.show_analytic_plan_id`
```xml
<?xml version="1.0"?>
<data inherit_id="base.view_company_form" priority="50">
<field name="website" position="after">
<field name="analytic_plan_id" />
</field>
</data>
```
Source: [snippets/base.view_company_form.show_analytic_plan_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/base.view_company_form.show_analytic_plan_id.xml)
## View Partner Form
### Add Commercial Partner Id
ID: `mint_system.base.view_partner_form.add_commercial_partner_id`
+17 -14
View File
@@ -76,11 +76,11 @@ ID: `mint_system.hr_payroll.report_payslip.gio_custom_payroll`
<div class="page">
<style>
div.page {
font-size: 0.75rem;
font-size: 0.75rem;
}
h4 {
padding-top: 3rem;
padding-bottom: 1rem;
padding-top: 3rem;
padding-bottom: 1rem;
}
</style>
@@ -94,35 +94,35 @@ ID: `mint_system.hr_payroll.report_payslip.gio_custom_payroll`
<span
t-esc="context_timestamp(datetime.datetime.now()).strftime('%d.%m.%Y')" />
</div>
<div class="col-3">
<span>Periode</span>
</div>
<div class="col-4">
<span t-field="o.date_from" /> - <span t-field="o.date_to" />
</div>
</div>
<div class="row">
<div class="col-2">
<span>Periode</span>
</div>
<div class="col-3">
<span t-field="o.date_from" /> - <span t-field="o.date_to" />
</div>
<!-- <div class="col-2">
<span>Personalnr.</span>
</div>
<div class="col-3">
<span t-esc="o.employee_id.registration_number" />
</div>
<div class="col-3">
</div> -->
<!-- <div class="col-3">
<span>Geleistete Stunden</span>
</div>
<div class="col-4">
<span t-esc="o.gio_worked_hours" />
</div>
</div> -->
</div>
<div class="row">
<!-- <div class="row">
<div class="col-2">
<span>Sozialvers. Nr.</span>
</div>
<div class="col-3">
<span t-esc="o.employee_id.identification_id" />
</div>
</div>
</div> -->
<table class="table td-no-top">
<style>
@@ -164,6 +164,9 @@ ID: `mint_system.hr_payroll.report_payslip.gio_custom_payroll`
</td>
<!-- Ansatz -->
<td>
<t t-if="line.code in ['1000']">
<span t-field="o.contract_id.gio_wage_hourly" />
</t>
<t t-if="line.code in ['5001']">
<span
t-esc="'%.2f' % (o.contract_id.gio_holiday_rate*100)" />
@@ -13,11 +13,11 @@
<div class="page">
<style>
div.page {
font-size: 0.75rem;
font-size: 0.75rem;
}
h4 {
padding-top: 3rem;
padding-bottom: 1rem;
padding-top: 3rem;
padding-bottom: 1rem;
}
</style>
@@ -31,35 +31,35 @@
<span
t-esc="context_timestamp(datetime.datetime.now()).strftime('%d.%m.%Y')" />
</div>
<div class="col-3">
<span>Periode</span>
</div>
<div class="col-4">
<span t-field="o.date_from" /> - <span t-field="o.date_to" />
</div>
</div>
<div class="row">
<div class="col-2">
<span>Periode</span>
</div>
<div class="col-3">
<span t-field="o.date_from" /> - <span t-field="o.date_to" />
</div>
<!-- <div class="col-2">
<span>Personalnr.</span>
</div>
<div class="col-3">
<span t-esc="o.employee_id.registration_number" />
</div>
<div class="col-3">
</div> -->
<!-- <div class="col-3">
<span>Geleistete Stunden</span>
</div>
<div class="col-4">
<span t-esc="o.gio_worked_hours" />
</div>
</div> -->
</div>
<div class="row">
<!-- <div class="row">
<div class="col-2">
<span>Sozialvers. Nr.</span>
</div>
<div class="col-3">
<span t-esc="o.employee_id.identification_id" />
</div>
</div>
</div> -->
<table class="table td-no-top">
<style>
@@ -101,6 +101,9 @@
</td>
<!-- Ansatz -->
<td>
<t t-if="line.code in ['1000']">
<span t-field="o.contract_id.gio_wage_hourly" />
</t>
<t t-if="line.code in ['5001']">
<span
t-esc="'%.2f' % (o.contract_id.gio_holiday_rate*100)" />
@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<data inherit_id="hr_timesheet.hr_timesheet_line_tree" priority="50">
<xpath expr="//field[@name='so_line']" position="attributes">
<attribute name="optional">show</attribute>
</xpath>
</data>
+15
View File
@@ -3,6 +3,21 @@ prev: ./snippets.md
---
# Hr Timesheet
## Hr Timesheet Line Tree
### Always Show So Line
ID: `mint_system.hr_timesheet.hr_timesheet_line_tree.always_show_so_line`
```xml
<?xml version="1.0"?>
<data inherit_id="hr_timesheet.hr_timesheet_line_tree" priority="50">
<xpath expr="//field[@name='so_line']" position="attributes">
<attribute name="optional">show</attribute>
</xpath>
</data>
```
Source: [snippets/hr_timesheet.hr_timesheet_line_tree.always_show_so_line.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_timesheet.hr_timesheet_line_tree.always_show_so_line.xml)
### Disable Editable
ID: `mint_system.hr_timesheet.hr_timesheet_line_tree.disable_editable`
```xml
+1 -1
View File
@@ -874,7 +874,7 @@ ID: `mint_system.ir_model.product_set_line.x_categ_id`
<record id="x_categ_id" model="ir.model.fields">
<field name="domain">[]</field>
<field name="field_description">Kategorei</field>
<field name="field_description">Produktkategorie</field>
<field name="model">product.set.line</field>
<field name="model_id" ref="product.model_product_set_line"/>
<field name="name">x_categ_id</field>
@@ -3,7 +3,7 @@
<record id="x_categ_id" model="ir.model.fields">
<field name="domain">[]</field>
<field name="field_description">Kategorei</field>
<field name="field_description">Produktkategorie</field>
<field name="model">product.set.line</field>
<field name="model_id" ref="product.model_product_set_line"/>
<field name="name">x_categ_id</field>
+10 -4
View File
@@ -417,10 +417,16 @@ ID: `mint_system.mail.message_activity_assigned.set_access_link_my_activities`
<xpath expr="//p[1]" position="replace">
<p style="margin: 16px 0px 16px 0px;">
<a href="/web?debug=1#action=365&amp;model=mail.activity&amp;view_type=kanban&amp;cids=1&amp;menu_id=1" style="background-color:#875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px;">
My Activities
<!-- Meine Aktivitäten -->
</a>
<t t-if="activity.res_model == 'hr.employee'">
<a href="/web?debug=1#action=365&amp;model=mail.activity&amp;view_type=kanban&amp;cids=1&amp;menu_id=1" style="background-color:#875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px;">
My Activities
</a>
</t>
<t t-else="">
<a t-att-href="access_link" t-att-data-oe-model="activity.res_model" t-att-data-oe-id="activity.res_id" style="background-color:#875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px;">
View <t t-esc="model_description or 'document'"/>
</a>
</t>
</p>
</xpath>
+34
View File
@@ -159,6 +159,40 @@ ID: `mint_system.project.view_project.show_date_start`
Source: [snippets/project.view_project.show_date_start.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/project.view_project.show_date_start.xml)
## View Task Form2
### Domain Active Sale Line
ID: `mint_system.project.view_task_form2.domain_active_sale_line`
```xml
<?xml version="1.0"?>
<data inherit_id="project.view_task_form2" priority="50">
<xpath expr="//field[@name='sale_line_id']" position="attributes">
<attribute name="domain">[('order_id.active', '=', True),('company_id', '=', company_id), ('is_service', '=', True), ('order_partner_id', 'child_of', commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale', 'done']), ('order_id', '=?', project_sale_order_id)]</attribute>
</xpath>
</data>
```
Source: [snippets/project.view_task_form2.domain_active_sale_line.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/project.view_task_form2.domain_active_sale_line.xml)
### Domain Gantt Dates
ID: `mint_system.project.view_task_form2.domain_gantt_dates`
```xml
<?xml version="1.0"?>
<data inherit_id="project.view_task_form2" priority="50">
<label for="planned_date_begin" position="attributes">
<attribute name="attrs"></attribute>
</label>
<xpath expr="//label[@for='planned_date_begin']/../div[1]" position="attributes">
<attribute name="attrs"></attribute>
</xpath>
</data>
```
Source: [snippets/project.view_task_form2.domain_gantt_dates.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/project.view_task_form2.domain_gantt_dates.xml)
### Parent Domain
ID: `mint_system.project.view_task_form2.parent_domain`
```xml
+43 -6
View File
@@ -966,9 +966,13 @@ ID: `mint_system.sale.report_saleorder_document.add_informations_space`
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="50">
<xpath expr="//div[@id='informations']" position="attributes">
<attribute name="style">padding-top: 1rem</attribute>
<attribute name="style">padding-bottom: 1rem</attribute>
<xpath expr="//div[@id='informations']" position="before">
<style>
div#informations {
padding-top: 1rem;
padding-bottom: 1rem
}
</style>
</xpath>
</data>
@@ -1505,8 +1509,7 @@ ID: `mint_system.sale.report_saleorder_document.remove_informations`
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="50">
<xpath expr="//div[@id='informations']" position="replace">
</xpath>
<xpath expr="//div[@id='informations']" position="replace" />
</data>
```
@@ -2049,6 +2052,25 @@ ID: `mint_system.sale.report_saleorder_document.style_trimada`
```
Source: [snippets/sale.report_saleorder_document.style_trimada.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.style_trimada.xml)
### Table Font Size
ID: `mint_system.sale.report_saleorder_document.table_font_size`
```xml
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="50">
<xpath expr="//table[hasclass('o_main_table')]" position="before">
<style>
table.o_main_table {
font-size: 0.8rem;
}
</style>
</xpath>
</data>
```
Source: [snippets/sale.report_saleorder_document.table_font_size.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.table_font_size.xml)
### X Hide On Sale Order
ID: `mint_system.sale.report_saleorder_document.x_hide_on_sale_order`
```xml
@@ -2224,6 +2246,21 @@ ID: `mint_system.sale.sale_order_portal_content.remove_calculation`
```
Source: [snippets/sale.sale_order_portal_content.remove_calculation.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.sale_order_portal_content.remove_calculation.xml)
### X Hide On Sale Order
ID: `mint_system.sale.sale_order_portal_content.x_hide_on_sale_order`
```xml
<?xml version="1.0"?>
<data inherit_id="sale.sale_order_portal_content" priority="50">
<xpath expr="//t[@t-foreach='sale_order.order_line']" position="attributes">
<attribute name="t-foreach">sale_order.order_line.filtered(lambda l: not l.product_id.x_hide_on_sale_order)</attribute>
</xpath>
</data>
```
Source: [snippets/sale.sale_order_portal_content.x_hide_on_sale_order.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.sale_order_portal_content.x_hide_on_sale_order.xml)
## Sale Order View Search Inherit Quotation
### Add Filter Cancel
ID: `mint_system.sale.sale_order_view_search_inherit_quotation.add_filter_cancel`
@@ -2629,7 +2666,7 @@ ID: `mint_system.sale.view_order_form.x_margin_percent`
<?xml version="1.0"?>
<data inherit_id="sale.view_order_form" priority="50">
<xpath expr="//field[@name='margin']" position="after">
<xpath expr="//field[@name='product_id']" position="after">
<field name="x_margin_percent" attrs="{'invisible': [('price_subtotal', '=', 0)]}" optional="hide" widget="percentage"/>
</xpath>
@@ -1,9 +1,13 @@
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="50">
<xpath expr="//div[@id='informations']" position="attributes">
<attribute name="style">padding-top: 1rem</attribute>
<attribute name="style">padding-bottom: 1rem</attribute>
<xpath expr="//div[@id='informations']" position="before">
<style>
div#informations {
padding-top: 1rem;
padding-bottom: 1rem
}
</style>
</xpath>
</data>
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="50">
<xpath expr="//div[@id='informations']" position="replace">
</xpath>
<xpath expr="//div[@id='informations']" position="replace" />
</data>
@@ -0,0 +1,12 @@
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="50">
<xpath expr="//table[hasclass('o_main_table')]" position="before">
<style>
table.o_main_table {
font-size: 0.8rem;
}
</style>
</xpath>
</data>
@@ -0,0 +1,9 @@
<?xml version="1.0"?>
<data inherit_id="sale.sale_order_portal_content" priority="50">
<xpath expr="//t[@t-foreach='sale_order.order_line']" position="attributes">
<attribute name="t-foreach">sale_order.order_line.filtered(lambda l: not l.product_id.x_hide_on_sale_order)</attribute>
</xpath>
</data>
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<data inherit_id="sale.view_order_form" priority="50">
<xpath expr="//field[@name='margin']" position="after">
<xpath expr="//field[@name='product_id']" position="after">
<field name="x_margin_percent" attrs="{'invisible': [('price_subtotal', '=', 0)]}" optional="hide" widget="percentage"/>
</xpath>
+59
View File
@@ -112,6 +112,20 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.add_header_and_
</t>
</xpath>
<!--
<xpath expr="//div[@id='informations']" position="after">
<t t-if="doc.note_header != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
<span class="note" t-field="doc.note_header"/>
</t>
</xpath>
<xpath expr="//div[@id='summary']" position="after">
<t t-if="doc.note_footer != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
<span class="note" t-field="doc.note_footer"/>
</t>
</xpath>
-->
</data>
```
@@ -597,6 +611,25 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.second_row`
```
Source: [snippets/sale_blanket_order.report_blanketorder_document.second_row.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.second_row.xml)
### Set Ids Tissa
ID: `mint_system.sale_blanket_order.report_blanketorder_document.set_ids_tissa`
```xml
<?xml version="1.0"?>
<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
<xpath expr="//div[@class='page']/div[2]" position="attributes">
<attribute name="id">address</attribute>
<attribute name="class" separator=" " add="trimada"/>
</xpath>
<xpath expr="//span[@t-field='doc.amount_untaxed']/../../../../.." position="attributes">
<attribute name="id">summary</attribute>
</xpath>
</data>
```
Source: [snippets/sale_blanket_order.report_blanketorder_document.set_ids_tissa.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.set_ids_tissa.xml)
### Set Ids
ID: `mint_system.sale_blanket_order.report_blanketorder_document.set_ids`
```xml
@@ -724,6 +757,32 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.style_gelso`
```
Source: [snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml)
### Style Tissa
ID: `mint_system.sale_blanket_order.report_blanketorder_document.style_tissa`
```xml
<?xml version="1.0"?>
<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="60">
<xpath expr="//div[hasclass('page')]" position="before">
<style>
.trimada {
margin-bottom: 20px;
}
</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>
</data>
```
Source: [snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml)
### Style Trimada
ID: `mint_system.sale_blanket_order.report_blanketorder_document.style_trimada`
```xml
@@ -13,4 +13,18 @@
</t>
</xpath>
<!--
<xpath expr="//div[@id='informations']" position="after">
<t t-if="doc.note_header != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
<span class="note" t-field="doc.note_header"/>
</t>
</xpath>
<xpath expr="//div[@id='summary']" position="after">
<t t-if="doc.note_footer != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
<span class="note" t-field="doc.note_footer"/>
</t>
</xpath>
-->
</data>
@@ -0,0 +1,13 @@
<?xml version="1.0"?>
<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
<xpath expr="//div[@class='page']/div[2]" position="attributes">
<attribute name="id">address</attribute>
<attribute name="class" separator=" " add="trimada"/>
</xpath>
<xpath expr="//span[@t-field='doc.amount_untaxed']/../../../../.." position="attributes">
<attribute name="id">summary</attribute>
</xpath>
</data>
@@ -0,0 +1,20 @@
<?xml version="1.0"?>
<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="60">
<xpath expr="//div[hasclass('page')]" position="before">
<style>
.trimada {
margin-bottom: 20px;
}
</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>
</data>
+9 -4
View File
@@ -1502,15 +1502,21 @@ ID: `mint_system.stock.report_delivery_document.move_lines`
<xpath expr="//table[@name='stock_move_line_table']" position="before">
<table class="table table-sm">
<style>
table.tissa {
margin-top: 30px;
margin-bottom: 30px;
}
</style>
<table class="tissa table table-sm">
<thead>
<tr>
<th>
<strong>Pos</strong>
</th>
<th>
<strong>Product</strong>
<strong>Product (Sales Description)</strong>
</th>
<th>
<strong></strong>
@@ -1527,7 +1533,7 @@ ID: `mint_system.stock.report_delivery_document.move_lines`
<span t-esc="move.position"/>
</td>
<td>
<span t-esc="move.product_id.name"/>
<span t-esc="move.product_id.description_sale"/>
</td>
<td></td>
<td>
@@ -1535,7 +1541,6 @@ ID: `mint_system.stock.report_delivery_document.move_lines`
</td>
</tr>
</tbody>
</table>
</xpath>