Compare commits

..

No commits in common. "13.0" and "13.0_dev" have entirely different histories.

4 changed files with 29 additions and 27 deletions

View File

@ -28,7 +28,7 @@ def run_migration(cr, registry):
except Exception as e:
_logger.error(f"[OWS] Fehler bei automatischer Felder-Migration: {e}")
'''
# Testsystem-Anpassungen (Admin umbenennen + andere archivieren)
try:
env['hr.employee'].anonymize_for_testsystem()
@ -45,7 +45,7 @@ def run_migration(cr, registry):
#import_machine_products.run_import(cr, registry)
'''
''' Funktioniert nicht:
try:

View File

@ -313,7 +313,7 @@ td {
margin:0;
padding:0;
color: gray;
background: #393939;
background: #ff0000;
}
/* a) The left part of the top-bar */
@ -1603,9 +1603,6 @@ td {
.o_chat_window {
display: none !important;
}
.machine-access-sidebar {
display: none !important;
}
.order-selector {
display: none !important;
}

View File

@ -11,14 +11,14 @@
</field>
</record>
<!-- Tree View: Produkte für Einweisungen und Kurse -->
<!-- Tree View: Einweisungsprodukte -->
<record id="view_machine_training_tree" model="ir.ui.view">
<field name="name">ows.machine.training.tree</field>
<field name="model">ows.machine.training</field>
<field name="arch" type="xml">
<tree editable="bottom">
<field name="machine_id"/>
<field name="training_id" domain="[('categ_id.name', 'in', ['Einweisungen', 'Kurse'])]"/>
<field name="training_id" domain="[('categ_id.name', '=', 'Einweisungen')]"/>
</tree>
</field>
</record>

View File

@ -8,30 +8,35 @@
<field name="arch" type="xml">
<xpath expr="//page[@name='sales_purchases']" position="before">
<page name="ows_machine_access" string="Offene Werkstatt (Hobbyhimmel)">
<group name="container_row_2" string="Sicherheitseinweisung">
<group>
<!-- Tab 1: HOBBYHIMMEL Basis -->
<page name="ows_basic" string="HOBBYHIMMEL Basis">
<group name="container_row_2">
<group string="Sicherheit">
<field name="security_briefing"/>
</group>
<group>
<field name="security_id"/>
</group>
</group>
<group string="Maschinenfreigaben">
<field name="machine_access_ids" context="{'default_partner_id': id}" nolabel="1">
<tree>
<field name="machine_id"/>
<field name="date_granted"/>
<field name="date_expiry"/>
<field name="granted_by_pos"/>
</tree>
</field>
</group>
<group string="Maschinenfreigaben Übersicht">
<field name="machine_access_html" readonly="1" widget="html" nolabel="1"/>
</group>
<group string="Zugang">
<field name="rfid_card"/>
</group>
</group>
</page>
<!-- Tab 2: HOBBYHIMMEL Einweisungen (HTML) -->
<page name="ows_machine_access_html" string="HOBBYHIMMEL Einweisungen">
<field name="machine_access_html" readonly="1" widget="html"/>
</page>
<!-- Tab 3: Einweisungen (Liste) -->
<page name="ows_machine_access_list" string="Einweisungen (Liste)">
<field name="machine_access_ids">
<tree>
<field name="machine_id"/>
<field name="date_granted"/>
<field name="date_expiry"/>
<field name="granted_by_pos"/>
</tree>
</field>
</page>
</xpath>
</field>