From e39837f09ced4052a440a647b5ae3596474bcc41 Mon Sep 17 00:00:00 2001 From: gitea Date: Wed, 2 Apr 2025 14:56:42 +0000 Subject: [PATCH] merge vvow_pos --- __manifest__.py | 4 +- static/src/js/partner_access_popup.js | 15 +- static/src/xml/ows_briefing_details_edit.xml | 161 ------------------- 3 files changed, 16 insertions(+), 164 deletions(-) diff --git a/__manifest__.py b/__manifest__.py index e3eb95b..0f18c22 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -16,8 +16,10 @@ 'data/demo_data.xml', ], 'qweb': [ - 'static/src/xml/partner_access_popup.xml', + 'static/src/xml/ows_briefing_details.xml', + 'static/src/xml/ows_briefing_details_edit.xml', 'static/src/xml/ows_pos_order_selector.xml', + 'static/src/xml/partner_access_popup.xml', ], 'installable': True, 'assets': { diff --git a/static/src/js/partner_access_popup.js b/static/src/js/partner_access_popup.js index ee5b25d..81a27f7 100644 --- a/static/src/js/partner_access_popup.js +++ b/static/src/js/partner_access_popup.js @@ -1,4 +1,15 @@ +odoo.define('open_workshop.models', function (require) { + "use strict"; + var models = require('point_of_sale.models'); + var field_utils = require('web.field_utils'); + models.load_fields('res.partner', 'vvow_birthday'); + models.load_fields('res.partner', 'vvow_security_briefing'); + models.load_fields('res.partner', 'vvow_security_id'); + models.load_fields('res.partner', 'vvow_rfid_card'); + models.load_fields('res.partner', 'create_date'); + models.load_fields('res.partner', 'vvow_document_id'); +}); odoo.define('open_workshop.partner_access_popup', function (require) { "use strict"; @@ -11,7 +22,7 @@ odoo.define('open_workshop.partner_access_popup', function (require) { screens.ClientListScreenWidget.include({ - renderElement: function () { + show: function () { this._super(); var self = this; var client = this.pos.get_order().get_client(); @@ -32,7 +43,7 @@ odoo.define('open_workshop.partner_access_popup', function (require) { const html = QWeb.render('PartnerMachineAccessList', { areas: result || [], }); - self.$('.client-details-right').append(html); + self.$('.client-details-right').html(html); }); }, }); diff --git a/static/src/xml/ows_briefing_details_edit.xml b/static/src/xml/ows_briefing_details_edit.xml index a541659..228cdcb 100644 --- a/static/src/xml/ows_briefing_details_edit.xml +++ b/static/src/xml/ows_briefing_details_edit.xml @@ -59,166 +59,5 @@ - -
-
-
- Sab. Laser - -
-
- Prusa - -
-
- Prusa MMU - -
-
- 3D Delta - -
-
- CNC Beami - -
-
- - - -
-
- Felder Kreissäge - -
-
- Felder Bandsäge - -
-
- Abricht-/Dickenhobel - -
-
- Drechselbank - -
-
- Festool Domino Fräse - -
-
- Maffel Duo Dübler - -
-
- amello Zeta P2 - -
-
- - - -
-
- Säge Metall - -
-
- MIG/MAG Schweißgerät - -
-
- WIG Schweißgerät - -
- -
- Drehbank - -
-
- Fräse Deckel FP2 - -
-
- Abkantbank - -
- -
-
-