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-10-09 14:17:19 +02:00
2 parents d95e056f8d e0daa2d47a
commit ebc192fd18
9 files changed
+92 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

snippets/account.view_move_form.replace_button_scan_wizzard.xml
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0"?>
<data inherit_id="account.view_move_form" priority="50">
<xpath expr="//button[@name='get_import_wizard']" position="replace">
<button type="object" name="get_import_wizard" string="Scan next QR Bill" attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"/>
</xpath>
<xpath expr="//button[@name='get_update_reference_wizard']" position="replace">
<button type="object" class="btn-primary o_button_payment_reference" name="get_update_reference_wizard" help="Update reference with scan" string="Scan QR" attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"/>
</xpath>
</data>
snippets/hr_timesheet.hr_timesheet_line_tree.x_vehicle_id.xml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0"?>
<data inherit_id="hr_timesheet.hr_timesheet_line_tree" priority="50">
<xpath expr="//tree/field[@name='category_id']" position="after">
<field name="x_vehicle_id" optional="hide"/>
</xpath>
</data>
snippets/ir_model.account_analytic_line.x_vehicle_id.xml
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<odoo>
<record id="x_vehicle_id" model="ir.model.fields">
<field name="field_description">Fahrzeug</field>
<field name="model">account.analytic.line</field>
<field name="model_id" ref="account.model_account_analytic_line"/>
<field name="name">x_vehicle_id</field>
<field name="readonly" eval="True"/>
<field name="store" eval="True"/>
<field name="copied" eval="False"/>
<field name="ttype">many2one</field>
<field name="relation">fleet.vehicle</field>
<field name="related">task_id.vehicle_id</field>
</record>
</odoo>
snippets/mrp.mrp_production_form_view.replace_workorder_tree_view.xml
+38 -39
View File
@@ -1,41 +1,40 @@
<?xml version="1.0"?>
<data inherit_id="mrp.mrp_production_form_view" priority="50">
<!-- origin_ref: mrp.mrp_production_workorder_tree_editable_view -->
<xpath expr="//field[@name='workorder_ids']" position="inside">
<tree editable="bottom" js_class="tablet_list_view">
<field name="consumption" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="is_produced" invisible="1"/>
<field name="is_user_working" invisible="1"/>
<field name="product_uom_id" invisible="1" readonly="0"/>
<field name="production_state" invisible="1"/>
<field name="production_bom_id" invisible="1"/>
<field name="qty_producing" invisible="1"/>
<field name="time_ids" invisible="1"/>
<field name="working_state" invisible="1"/>
<field name="operation_id" invisible="1" domain="['|', ('bom_id', '=', production_bom_id), ('bom_id', '=', False)]" context="{'default_workcenter_id': workcenter_id, 'default_company_id': company_id}"/>
<field name="name" string="Operation"/>
<field name="workcenter_id"/>
<field name="product_id" optional="hide"/>
<field name="component_id" optional="hide"/>
<field name="lot_id" optional="hide" domain="[('product_id','=', component_id),'|',('company_id','=',False),('company_id','=',company_id)]"/>
<field name="date_planned_start" optional="show"/>
<field name="date_planned_finished" optional="hide"/>
<field name="date_start" optional="hide" readonly="1"/>
<field name="date_finished" optional="hide" readonly="1"/>
<field name="duration_expected" widget="float_time"/>
<field name="duration" widget="mrp_time_counter" attrs="{'invisible': [('production_state','=', 'draft')], 'readonly': [('is_user_working', '=', True)]}"/>
<field name="state" widget="badge" decoration-success="state == 'done'" decoration-info="state not in ('done', 'cancel')" attrs="{'invisible': [('production_state', 'in', ('draft', 'done'))]}"/>
<field name="production_state" invisible="1"/>
<button name="button_start" type="object" string="Start" class="btn-success" attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', '=', 'done'), ('is_user_working', '!=', False)]}"/>
<button name="button_pending" type="object" string="Pause" class="btn-warning" attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
<button name="button_finish" type="object" string="Done" class="btn-success" attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
<button name="433" type="action" string="Block" context="{'default_workcenter_id': workcenter_id}" class="btn-danger" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked')]}"/>
<button name="button_unblock" type="object" string="Unblock" context="{'default_workcenter_id': workcenter_id}" class="btn-danger" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}"/>
<button name="action_open_wizard" type="object" icon="fa-external-link" class="oe_edit_only" context="{'default_workcenter_id': workcenter_id}"/>
<button name="open_tablet_view" type="object" icon="fa-tablet" context="{'from_production_order': True}" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'cancel', 'done')), ('state', '=', 'done')]}"/>
<field name="show_json_popover" invisible="1"/>
<field name="json_popover" widget="mrp_workorder_popover" string=" " width="0.1" attrs="{'invisible': [('show_json_popover', '=', False)]}"/>
</tree>
</xpath>
<!-- origin_ref: mrp.mrp_production_workorder_tree_editable_view -->
<xpath expr="//field[@name='workorder_ids']" position="inside">
<tree editable="bottom" js_class="tablet_list_view">
<field name="consumption" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="is_produced" invisible="1"/>
<field name="is_user_working" invisible="1"/>
<field name="product_uom_id" invisible="1" readonly="0"/>
<field name="production_state" invisible="1"/>
<field name="production_bom_id" invisible="1"/>
<field name="qty_producing" invisible="1"/>
<field name="time_ids" invisible="1"/>
<field name="working_state" invisible="1"/>
<field name="operation_id" invisible="1" domain="['|', ('bom_id', '=', production_bom_id), ('bom_id', '=', False)]" context="{'default_workcenter_id': workcenter_id, 'default_company_id': company_id}"/>
<field name="name" string="Operation"/>
<field name="workcenter_id"/>
<field name="product_id" optional="hide"/>
<field name="lot_id" optional="hide" domain="['|',('company_id','=',False),('company_id','=',company_id)]"/>
<field name="date_planned_start" optional="show"/>
<field name="date_planned_finished" optional="hide"/>
<field name="date_start" optional="hide" readonly="1"/>
<field name="date_finished" optional="hide" readonly="1"/>
<field name="duration_expected" widget="float_time"/>
<field name="duration" widget="mrp_time_counter" attrs="{'invisible': [('production_state','=', 'draft')], 'readonly': [('is_user_working', '=', True)]}"/>
<field name="state" widget="badge" decoration-success="state == 'done'" decoration-info="state not in ('done', 'cancel')" attrs="{'invisible': [('production_state', 'in', ('draft', 'done'))]}"/>
<field name="production_state" invisible="1"/>
<button name="button_start" type="object" string="Start" class="btn-success" attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', '=', 'done'), ('is_user_working', '!=', False)]}"/>
<button name="button_pending" type="object" string="Pause" class="btn-warning" attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
<button name="button_finish" type="object" string="Done" class="btn-success" attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
<button name="433" type="action" string="Block" context="{'default_workcenter_id': workcenter_id}" class="btn-danger" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked')]}"/>
<button name="button_unblock" type="object" string="Unblock" context="{'default_workcenter_id': workcenter_id}" class="btn-danger" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}"/>
<button name="action_open_wizard" type="object" icon="fa-external-link" class="oe_edit_only" context="{'default_workcenter_id': workcenter_id}"/>
<button name="open_tablet_view" type="object" icon="fa-tablet" context="{'from_production_order': True}" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'cancel', 'done')), ('state', '=', 'done')]}"/>
<field name="show_json_popover" invisible="1"/>
<field name="json_popover" widget="mrp_workorder_popover" string=" " width="0.1" attrs="{'invisible': [('show_json_popover', '=', False)]}"/>
</tree>
</xpath>
</data>
snippets/mrp.view_mrp_bom_filter.add_x_type_description.xml
+3 -3
View File
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<data inherit_id="mrp.view_mrp_bom_filter" priority="50">
<xpath expr="//field[@name='bom_line_ids']" position="after">
<field name="x_type_description" string="Typenbezeichnung" filter_domain="['|', ('x_type_description', 'ilike', self), ('x_type_description_bom_line', 'ilike', self)]"/>
</xpath>
<xpath expr="//field[@name='bom_line_ids']" position="after">
<field name="x_type_description" string="Typenbezeichnung" filter_domain="[('x_type_description', 'ilike', self)]"/>
</xpath>
</data>
snippets/product.product_template_kanban_view.add_product_info.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<data inherit_id="product.product_template_kanban_view" priority="50">&gt;
<xpath expr="//div[@class='oe_kanban_details']" position="replace"><div class="oe_kanban_details"><t t-if="record.default_code.value">[<field name="default_code"/>]</t><strong class="o_kanban_record_title"><field name="name"/></strong><div><field name="type_description"/></div><div t-if="record.type.raw_value == 'product'">On hand: <field name="qty_available"/> <field name="uom_id"/> / <field name="virtual_available"/> <field name="uom_id"/>
<xpath expr="//div[@class='oe_kanban_details']" position="replace"><div class="oe_kanban_details"><t t-if="record.default_code.value">[<field name="default_code"/>] </t><strong class="o_kanban_record_title"><field name="name"/></strong><div><field name="type_description"/></div><div t-if="record.type.raw_value == 'product'">On hand: <field name="qty_available"/> <field name="uom_id"/> / <field name="virtual_available"/> <field name="uom_id"/>
</div></div></xpath>
</data>
snippets/product.product_template_only_form_view.hide_default_code.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<data inherit_id="product.product_template_only_form_view" priority="50">
<xpath expr="//group[@name='group_general']/field[@name='default_code']" position="replace"/>
<xpath expr="//page[@name='general_information']//field[@name='default_code']" position="replace"/>
</data>
snippets/product.product_template_search_view.add_type_description.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<data inherit_id="product.product_template_search_view" priority="50">
<xpath expr="//field[@name='pricelist_id']" position="after">
<xpath expr="//field[@name='attribute_line_ids']" position="after">
<separator/>
<field string="Typenbezeichnung" name="type_description" filter_domain="['|', ('type_description', 'like', self), ('type_description2', 'like', self)]"/>
</xpath>
snippets/sale.report_saleorder_document.hs_code_ and_origin.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="50">
<xpath expr="//th[@name='th_description']" position="after">
<th name="th_hs_code">HS-Code</th>
</xpath>
<xpath expr="//th[@name='th_hs_code']" position="after">
<th name="th_Origin">Origin</th>
</xpath>
<xpath expr="//td[@name='td_name']" position="after">
<td name="td_hs_code"></td>
</xpath>
<xpath expr="//td[@name='td_hs_code']" position="after">
<td name="td_oriding"></td>
</xpath>
</data>