hobbyhimmel/open_workshop
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: hobbyhimmel:13.0_dev
Branches Tags
hobbyhimmel:13.0_dev
hobbyhimmel:18.0
hobbyhimmel:18.0-target
hobbyhimmel:13.0
hobbyhimmel:13.0_dev-target
hobbyhimmel:17.0_dev
hobbyhimmel:17.0_dev-target
hobbyhimmel:17.0
hobbyhimmel:16.0
hobbyhimmel:18.0_dev
hobbyhimmel:main
...
pull from: hobbyhimmel:13.0
Branches Tags
hobbyhimmel:18.0
hobbyhimmel:18.0-target
hobbyhimmel:13.0
hobbyhimmel:13.0_dev
hobbyhimmel:13.0_dev-target
hobbyhimmel:17.0_dev
hobbyhimmel:17.0_dev-target
hobbyhimmel:17.0
hobbyhimmel:16.0
hobbyhimmel:18.0_dev
hobbyhimmel:main

8 Commits
13.0_dev ... 13.0

Author SHA1 Message Date
Matthias Lotz
adbb4f2f56 Merge pull request '13.0_dev' (#6) from 13.0_dev into 13.0 
Reviewed-on: #6
 2025-06-26 17:48:09 +02:00
matthias.lotz
38b538d45e [13.0][IMP] Ansicht Machine Product Training lässt nun auch die Auswahl von Kursen zu 2025-05-31 10:35:03 +02:00
matthias.lotz
0211537664 [IMP] open_workshop: restructure partner form tab for machine access and safety briefing 
- Combined machine access list and HTML overview into a unified tab "Offene Werkstatt (Hobbyhimmel)"
- Grouped security briefing fields into a compact two-column layout
- Improved usability by keeping related data in one place and reducing click depth
 2025-05-29 16:37:37 +02:00
matthias.lotz
a25c82b698 [IMP] open_workshop: Default partner in machine access popup 
When adding a new machine access from the partner form,
the partner field is now prefilled automatically using context defaults.
This improves UX by avoiding redundant manual selection of the same partner.

Changes:
- Passed {'default_partner_id': id} context to machine_access_ids field
 2025-05-29 15:37:43 +02:00
gitea
c178f7291d fixed pos receipt print, machine-access-sidebar is now invisible 2025-05-18 08:28:04 +00:00
matthias.lotz
12695c8e44 removed red flag in pos 2025-05-12 19:36:50 +02:00
matthias.lotz
4adfcd7d38 removed Testsystem-Anapssungen 2025-05-12 18:26:08 +02:00
matthias.lotz
4d7e7e5f19 [FIX] open_workshop: Mehrere Maschinenfreigaben pro Einweisungsprodukt im POS 
Beim Kauf eines Einweisungsprodukts wurden bisher nur eine Maschinenfreigabe erstellt,
selbst wenn das Produkt mehreren Maschinen zugeordnet war.
Dieser Fix passt _process_order an, sodass alle zugehörigen Maschinen erfasst und
ggf. neue Freigaben für den Kunden erstellt werden.

+ Nutzung von defaultdict zur besseren Produkt-Maschine-Zuordnung
+ Klares Logging zur Nachvollziehbarkeit
+ Verhindert doppelte Freigaben
 2025-05-06 18:49:31 +02:00
4 changed files with 27 additions and 29 deletions
Show Stats Expand all files Collapse all files

4
post_init_hook.py
View File

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

5
static/src/css/pos.css
View File

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

4
views/machine_product_training_views.xml
View File

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

29
views/res_partner_view.xml
View File

@ -8,27 +8,17 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//page[@name='sales_purchases']" position="before"> <xpath expr="//page[@name='sales_purchases']" position="before">
<!-- Tab 1: HOBBYHIMMEL Basis --> <page name="ows_machine_access" string="Offene Werkstatt (Hobbyhimmel)">
<page name="ows_basic" string="HOBBYHIMMEL Basis"> <group name="container_row_2" string="Sicherheitseinweisung">
<group name="container_row_2"> <group>
<group string="Sicherheit">
<field name="security_briefing"/> <field name="security_briefing"/>
</group>
<group>
<field name="security_id"/> <field name="security_id"/>
</group> </group>
<group string="Zugang">
<field name="rfid_card"/>
</group> </group>
</group> <group string="Maschinenfreigaben">
</page> <field name="machine_access_ids" context="{'default_partner_id': id}" nolabel="1">
<!-- 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> <tree>
<field name="machine_id"/> <field name="machine_id"/>
<field name="date_granted"/> <field name="date_granted"/>
@ -36,8 +26,13 @@
<field name="granted_by_pos"/> <field name="granted_by_pos"/>
</tree> </tree>
</field> </field>
</group>
<group string="Maschinenfreigaben Übersicht">
<field name="machine_access_html" readonly="1" widget="html" nolabel="1"/>
</group>
</page> </page>
</xpath> </xpath>
</field> </field>
</record> </record>