Vor DoppelTeam

This commit is contained in:
jopster
2024-11-12 13:24:54 +01:00
parent 3a396eceb5
commit 9b2da96cd5
31 changed files with 924 additions and 184 deletions
+73 -43
View File
@@ -111,27 +111,40 @@
</field>
</record>
<record id="dss_project_contracts_tree" model="ir.ui.view">
<field name="name">dss_project_contracts_tree</field>
<field name="model">dss.contracts</field>
<field name="priority" eval="17"/>
<field name="arch" type="xml">
<tree string="Vertragsuebersicht" editable="bottom" multi_edit="1" edit="1" default_order="contract_id">
<field name="contract_auto_name"/>
<field name="contract_auto_id"/>
<field name="client_id"/>
<field name="contract_name"/>
<field name="contract_state"/>
<field name="project"/>
<field name="project_id"/>
<field name="contract_auto_name" optional="show"/>
<field name="project_id" optional="hide"/>
<field name="client_short_email" optional="hide"/>
<field name="client_short_vorname" optional="hide"/>
<field name="client_short_name"/>
<field name="werbe_feld_selected" widget="many2many_tags"/>
<field name="ads_last_state"/>
<field name="ads_last_work_state"/>
<field name="ads_last_todo_state"/>
</tree>
<field name="client_short_name" optional="hide"/>
<field name="contract_name" optional="show"/>
<field name="contract_state" optional="show"/>
<field name="project" optional="hide"/>
<field name="werbe_feld_selected" widget="many2many_tags" optional="show"/>
<field name="ads_last_state" optional="show"/>
<field name="ads_last_work_state" optional="show"/>
<field name="ads_last_todo_state" optional="show"/>
<field name="contract_writer" optional="hide"/>
<!-- <field name="contract_auto_id" optional="show"/>
<field name="client_id" optional="show"/>
-->
</tree>
</field>
</record>
<record id="dss_project_contracts_tree_inherit_js_class" model="ir.ui.view">
<field name="name">dss_project_contracts_tree_inherit</field>
<field name="model">dss.contracts</field>
<field name="inherit_id" ref="DigitalSignage.dss_project_contracts_tree"/>
<field name="arch" type="xml">
<xpath expr="//tree" position="attributes">
<attribute name="js_class">button_in_tree</attribute>
</xpath>
</field>
</record>
@@ -213,8 +226,7 @@
</field>
</record>
<record id="dss_main_contracts_tree" model="ir.ui.view">
<!-- <record id="dss_main_contracts_tree" model="ir.ui.view">
<field name="name">dss_contracts_tree</field>
<field name="model">dss.contracts</field>
<field name="priority" eval="17"/>
@@ -224,9 +236,12 @@
<field name="contract_id"/>
<field name="contract_name"/>
<field name="project"/>
<field name="contract_writer" optional="show"/>
</tree>
</field>
</record>
-->
<record id="dss_main_contracts_form" model="ir.ui.view">
<field name="name">dss_main_contracts_form</field>
@@ -308,29 +323,30 @@
<field name="contract_state" string="Vertragsstatus"/>
</group>
</div>
<div class="row">
<field name="ads_last_ad" invisible="1"/>
<group attrs="{'invisible': [('ads_last_ad','=',False)]}" >
<field name="ads_last_state" string="Zuständigkeit (letzte Kamp.)"/>
</group>
</div>
<div class="row">
<group attrs="{'invisible': [('ads_last_ad','=',False)]}" >
<field name="ads_last_work_state" string="Arbeitsstand (letzte Kamp.)"/>
</group>
</div>
<field name="ads_last_work_state_text" invisible="1"/>
<div class="row" attrs="{'invisible': [('ads_last_work_state_text','!=','Sonstiges')]}" >
<group>
<field name="work_state_info"/>
</group>
</div>
<div class="row">
<group>
<field name="ads_last_state" string="Zuständigkeit (letzte Kamp.)"/>
</group>
</div>
<div class="row">
<group>
<field name="ads_last_work_state" string="Arbeitsstand (letzte Kamp.)"/>
</group>
</div>
<field name="ads_last_work_state_text" invisible="1"/>
<div class="row" attrs="{'invisible': [('ads_last_work_state_text','!=','Sonstiges')]}" >
<group>
<field name="work_state_info"/>
</group>
</div>
<div class="row">
<group>
<group attrs="{'invisible': [('ads_last_ad','=',False)]}" >
<field name="ads_last_todo_state" string="nächste Aufgabe (letzte Kamp.)"/>
</group>
</div>
<div class="row">
<group>
<group attrs="{'invisible': [('ads_last_ad','=',False)]}" >
<field name="ads_last_todo_state_until" string="Aufgabe bis"/>
</group>
</div>
@@ -542,7 +558,7 @@
<div class="col-2">
<br></br>
<br></br>
<button icon="DigitalSignage/static/src/img/dsscalc.png" name="pyaction_dss_contract_calc_runtime_end" type="object" class="dss-smallbutton" data-hotkey="c" help="Berechnet das Laufzeitende des Vertrages und trägt diesen in einen Kalender ein !"/>
<button icon="DigitalSignage/static/src/img/dsscalc.png" name="pyaction_dss_contract_calc_runtime_end" type="object" class="dss-smallbutton" data-hotkey="c" help="Berechnet das Laufzeitende des Vertrages und trägt diesen in einen Kalender ein !" attrs="{'invisible':[('contract_cancel_mon','=',0)]}"/>
</div>
</div>
<div class="row" >
@@ -561,10 +577,24 @@
<div class="row" >
<div class="col-8">
<group string="Abrechnungsmodus">
<field name="paymentsystems" string="Abrechnung"/>
<field name="paymentsystems" string="Abrechnungmodus"/>
<field name="paymentinterval" string="Abrechnungsinterval"/>
<field name="intern_info_payment_off"/>
</group>
<group string="Zahlungseingang">
<group col="2" string="Zahlungsausgang">
<group>
<group colspan="2">
<field name="contract_receipt_done"/>
<field name="contract_receipt_number" placeholder="XXXXXXXX Rechnungsnummer"/>
<field name="contract_receipt_done_date"/>
<field name="contract_receipt_done_until_date"/>
</group>
</group>
<group>
<field name="contract_receipt_done_multi"/>
</group>
</group>
<group string="Zahlungseingang">
<field name="contract_payment_done"/>
<field name="contract_payment_done_date"/>
</group>
@@ -583,19 +613,19 @@
<field name="vnnox_zugang_erstellt" widget="boolean_toggle"/>
<field name="vnnox_zugang_gesendet" widget="boolean_toggle"/>
<field name="vnnox_zugang_username"/>
<field name="vnnox_zugang_password" password="True"/>
<field name="vnnox_zugang_password"/>
</group>
<group string="XIBO Anmeldung für Displays">
<field name="xibo_zugang_erstellt" widget="boolean_toggle"/>
<field name="xibo_zugang_gesendet" widget="boolean_toggle"/>
<field name="xibo_zugang_username"/>
<field name="xibo_zugang_password" password="True"/>
<field name="xibo_zugang_password" />
</group>
<group string="LMW Anmeldung für Kunden allgemein">
<field name="lmw_zugang_erstellt" widget="boolean_toggle"/>
<field name="lmw_zugang_gesendet" widget="boolean_toggle"/>
<field name="lmw_zugang_username"/>
<field name="lmw_zugang_password" password="True" widget='password'/>
<field name="lmw_zugang_password" />
</group>
</div>
</div>
@@ -853,12 +883,12 @@
</record>
<record id="action_set_SaveViewState" model="ir.actions.server">
<field name="name">Einstellung der Ansicht speichern</field>
<field name="name">Zum Cloud-Ordner springen</field>
<field name="model_id" ref="model_dss_contracts"/>
<field name="binding_model_id" ref="model_dss_contracts"/>
<field name="binding_view_types">kanban</field>
<field name="binding_view_types">form</field>
<field name="state">code</field>
<field name="code">action = records.setFirstKampagne()</field>
<field name="code">action = records.jumpcloud()</field>
</record>
<data noupdate="1">
+11
View File
@@ -66,6 +66,17 @@
</group>
</group>
</page>
<page name="ledsetings" string="LEDCabinet Daten" attrs="{'invisible': ['|',('geraetetyp','!=','ANZ'),('grundsystem_kennung','!=','LED')]}" >
<group name="ledsettings_hw" string="LED Cabinet Daten" colspan="2">
<group name="ledsettings" string="LED Cabinet Grunddaten" colspan="2">
<field name="ledcab_module_breite"/>
<field name="ledcab_module_hoehe"/>
</group>
<group name="ledsettings" string="LED Modul" colspan="2">
<field name="ledcab_module"/>
</group>
</group>
</page>
<page name="receivingssetings" string="Receivingcard Daten" attrs="{'invisible': ['|',('led_geraetetyp','!=','REC'),('grundsystem_kennung','!=','LED')]}" >
<group name="ledsettings_hw" string="LED Receivingcard Daten" colspan="2">
<field name="led_receivingcard_kennung" colspan="2"/>
+3 -2
View File
@@ -53,6 +53,7 @@
<field name="maintainname"/>
<field name="maintaintyp"/>
<field name="project"/>
<field name="maintain_tag"/>
</tree>
</field>
</record>
@@ -61,9 +62,9 @@
<field name="name">DigitalSignage Einsätze</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">dss.maintaintask</field>
<field name="view_mode">form,tree</field>
<field name="view_mode">tree,form</field>
<field name="domain"></field>
<field name="context">{'search_default_actual_projects': 1}</field>
<field name="context">{}</field>
<field name="help" type="html">
<p class="'o_view_nocontent_smiling_face">
Fuege ein System ein !
+47 -1
View File
@@ -44,8 +44,17 @@
<field name="grundsystemname" string="Kategorie"/>
<field name="errichtet_am"/>
<field name="aktstatus_color" widget="color"/>
<field name="cloudlink"/>
</group>
<div class="row" >
<div class="col-6">
<group>
<field name="cloudlink"/>
</group>
</div>
<div class="col-2">
<button name="pyaction_dss_project_set_def_cloud" type="object" class="dss-smallbutton fa fa-chain" data-hotkey="c" help="Läd Standard Einstellungen für Projekt Cloud Ordner"/>
</div>
</div>
<notebook>
<page name="partnersettings" string="Partner/Adressen">
<group>
@@ -115,6 +124,19 @@
<field name="maps_type"/>
<field name="maps_marker"/>
<field name="maps_image" widget="Binary"/>
<field name="maps_image_2" widget="Binary"/>
<field name="maps_image_3" widget="Binary"/>
<field name="maps_typ_interactive" widget="boolean_toggle"/>
<field name="maps_visitors"/>
<field name="maps_displaytyp"/>
<field name="maps_displaysize"/>
<field name="maps_werbeflaechen_a_free" widget="boolean_toggle"/>
<field name="maps_werbeflaechen_a"/>
<field name="maps_werbeflaechen_b_free" widget="boolean_toggle"/>
<field name="maps_werbeflaechen_b"/>
<field name="maps_freespaces_b_show" widget="boolean_toggle"/>
<field name="maps_freespaces_b"/>
<field name="maps_werbemedien"/>
<field name="maps_text" widget="html_frame"/>
</group>
</div>
@@ -131,6 +153,7 @@
<field name="maintainname"/>
<field name="maintaintyp"/>
<field name="project"/>
<field name="maintain_tag"/>
</tree>
</field>
</page>
@@ -200,6 +223,8 @@
<a name="%(portal.portal_share_action)d" role="menuitem" type="action" class="dropdown-item">Projekt teilen</a>
<a t-if="widget.editable" role="menuitem" type="edit" class="dropdown-item">Bearbeiten</a>
<div role="separator" class="dropdown-divider"></div>
<a name="jumpcloud" role="menuitem" type="object" class="dropdown-item">Cloud Ordner öffnen</a>
<div role="separator" class="dropdown-divider"></div>
<ul class="oe_kanban_colorpicker" data-field="color"/>
</div>
</div>
@@ -237,6 +262,18 @@
</field>
</record>
<record id="dss_main_view_kanban_inherit_js_class" model="ir.ui.view">
<field name="name">dss_project_contracts_tree_inherit</field>
<field name="model">dss.projects</field>
<field name="inherit_id" ref="DigitalSignage.dss_main_view_kanban"/>
<field name="arch" type="xml">
<xpath expr="//kanban" position="attributes">
<attribute name="js_class">button_in_kanban</attribute>
</xpath>
</field>
</record>
<record id="dss_main_view_tree" model="ir.ui.view">
<field name="name">dss_projects_tree</field>
<field name="model">dss.projects</field>
@@ -279,4 +316,13 @@
</field>
</record>
<record id="action_set_prjumpcloud" model="ir.actions.server">
<field name="name">Zum Cloud-Ordner springen</field>
<field name="model_id" ref="model_dss_projects"/>
<field name="binding_model_id" ref="model_dss_projects"/>
<field name="binding_view_types">form,tree,kanban</field>
<field name="state">code</field>
<field name="code">action = records.jumpcloud()</field>
</record>
</odoo>
+7 -6
View File
@@ -7,10 +7,11 @@
<field name="priority" eval="16"/>
<field name="arch" type="xml">
<tree string="Projectstatus">
<field name="color" widget="color"/>
<field name="color" widget="color"/>
<field name="statusname"/>
<field name="typ" string="Zuordnung"/>
<field name="icon" widget="image"/>
<field name="icon" widget="image"/>
<field name="order" widget="handle"/>
</tree>
</field>
</record>
@@ -23,10 +24,10 @@
<sheet>
<group>
<group name="basethings">
<field name="statusname" string="Statusname"/>
<field name="typ" string="Zuordnung"/>
<field name="color" string="Farbindex" widget="color"/>
<field name="icon" string="Icon" widget="image"/>
<field name="statusname" string="Statusname"/>
<field name="typ" string="Zuordnung"/>
<field name="color" string="Farbindex" widget="color"/>
<field name="icon" string="Icon" widget="image"/>
</group>
</group>
</sheet>
+7
View File
@@ -29,9 +29,16 @@
</div>
<div class="row">
<group>
<field name="def_cloud_url_base"/>
</group>
<group string="Vertragspfad" help="vom Projektordner aus">
<field name="def_contract_cloudpath"/>
<field name="def_contract_cloudpath_sample"/>
</group>
<group>
<field name="def_contract_cloudpath_V2"/>
<field name="def_contract_cloudpath_sample_V2"/>
</group>
</div>
<div class="row">
<group>
+29 -21
View File
@@ -13,15 +13,15 @@
<field name="standort" string="Standort des Geräts"/>
</group>
<group name="components" string="Für LCD Gesamtsysteme" attrs="{'invisible': [('grundsystem_kennung','!=','LCD')]}" >
<field name="osvorhanden"/>
<field name="has_heizung"/>
<field name="has_klima"/>
<field name="has_fan"/>
<field name="osvorhanden"/>
<field name="has_heizung"/>
<field name="has_klima"/>
<field name="has_fan"/>
</group>
<group name="components" string="Für LED Gesamtsysteme" attrs="{'invisible': [('grundsystem_kennung','!=','LED')]}" colspan="4" >
<field name="has_heizung"/>
<field name="has_klima"/>
<field name="has_fan"/>
<field name="has_heizung"/>
<field name="has_klima"/>
<field name="has_fan"/>
</group>
<notebook>
<page name="osssetings" string="LCDSystem Daten" attrs="{'invisible': [('grundsystem_kennung','!=','LCD')]}" >
@@ -36,31 +36,39 @@
<field name="lcd_netzteil"/>
</group>
</page>
<page name="osssetings" string="LEDSystem Daten" attrs="{'invisible': [('grundsystem_kennung','!=','LED')]}" >
<group name="ledsettings" string="LED Grunddaten">
<field name="led_pixelpitch" colspan="2"/>
<field name="led_breite"/>
<field name="led_hoehe"/>
<field name="led_pixel_breite"/>
<field name="led_pixel_hoehe"/>
</group>
<field name="led_pixelpitch" colspan="2"/>
<field name="led_breite"/>
<field name="led_hoehe"/>
<field name="led_pixel_breite"/>
<field name="led_pixel_hoehe"/>
</group>
<group name="ledsettings_2" string="LEDWand Aufbau">
<field name="led_cab_in_breite"/>
<field name="led_cab_in_hoehe"/>
</group>
<group name="ledsettings_hw" string="LED Hardware">
<field name="led_module"/>
<field name="led_receivingcard"/>
<field name="led_netzteile"/>
</group>
<field name="led_module"/>
<field name="led_receivingcard"/>
<field name="led_netzteile"/>
</group>
</page>
<page name="aussehen" string="Aussehen/Bauart">
<group name="aussehen_farbe" string="Farbgebung">
<field name="farbe" widget='color'/>
<field name="farbe" widget='color'/>
</group>
<group name="aussehen_Bauart" string="Bauart/Montage" attrs="{'invisible': [('grundsystem_kennung','!=','LCD')]}">
<field name="lcd_montage"/>
<field name="lcd_montage"/>
<field name="lcd_montage_sonstige" attrs="{'invisible': [('grundsystem_kennung','!=','XXX')]}"/>
</group>
<group name="aussehen_Bauart" string="Bauart/Montage" attrs="{'invisible': [('grundsystem_kennung','!=','LED')]}">
<field name="led_montage"/>
<field name="led_montage_sonstige" attrs="{'invisible': [('grundsystem_kennung','!=','XXX')]}"/>
<field name="led_montage"/>
<field name="led_montage_sonstige" attrs="{'invisible': [('grundsystem_kennung','!=','XXX')]}"/>
</group>
<group name="Bauart_Cabinets" string="Cabinets" attrs="{'invisible': [('grundsystem_kennung','!=','LED')]}">
<field name="led_cabinets_sonstige" widget="many2many"/>
</group>
</page>
<page name="energie" string="Ausstatung">
+13 -10
View File
@@ -10,9 +10,11 @@
<field name="systemname"/>
<field name="kennung"/>
<field name="default_adstructure"/>
<field name="farbe" string="Farbindex" widget="color"/>
<field name="icon" />
<field name="icon_5050" />
<field name="open_close_standard_state" widget="boolean_toggle"/>
<field name="farbe" string="Farbindex" widget="color"/>
<field name="icon" />
<field name="icon_5050" />
<field name="order" widget="handle"/>
</tree>
</field>
</record>
@@ -24,15 +26,16 @@
<form>
<sheet>
<group name="codding" string="Kennungen">
<field name="systemname"/>
<field name="kennung" string="Kurzkennung (XXX)"/>
<field name="default_adstructure"/>
<field name="default_cloud_path"/>
<field name="systemname"/>
<field name="kennung" string="Kurzkennung (XXX)"/>
<field name="default_adstructure"/>
<field name="default_cloud_path"/>
<field name="open_close_standard_state" widget="boolean_toggle"/>
</group>
<group name="erscheinung" string="Aussehen">
<field name="farbe" string="Farbkennung" widget="color"/>
<field name="icon" widget="image"/>
<field name="icon_5050" widget="image"/>
<field name="farbe" string="Farbkennung" widget="color"/>
<field name="icon" widget="image"/>
<field name="icon_5050" widget="image"/>
</group>
<group name="mailtemplates" string="Standard EMail">
<field name="email_template_welcome"/>
+56
View File
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="action_dss_main_payintervals" model="ir.actions.act_window">
<field name="name">DigitalSignage Alle Abrechnungs-Intervalle</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">dss.payintervals</field>
<field name="view_mode">tree,form</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
No Contracts/Clients found. Let's create one!
</p>
<p>
Keep track of the progress of your contracts from creation to completion.<br/>
Collaborate efficiently by chatting in real-time or via email.
</p>
</field>
</record>
<record id="dss_main_payintervals_tree" model="ir.ui.view">
<field name="name">dss_payintervals_tree</field>
<field name="model">dss.payintervals</field>
<field name="priority" eval="17"/>
<field name="arch" type="xml">
<tree string="Vertragsuebersicht">
<field name="payintervalname"/>
<field name="description"/>
<field name="monate"/>
</tree>
</field>
</record>
<record id="dss_main_payintervals_form" model="ir.ui.view">
<field name="name">dss_main_payintervals_form</field>
<field name="model">dss.payintervals</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<form>
<sheet>
<group name="interval" string="Intervaldaten">
<field name="payintervalname"/>
<field name="description"/>
<field name="monate"/>
</group>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" options="{'post_refresh':True}" help="Follow this project to automatically track the events associated to tasks and issues of this project." groups="base.group_user"/>
<field name="activity_ids"/>
<field name="message_ids"/>
</div>
</form>
</field>
</record>
</odoo>
+3
View File
@@ -8,6 +8,9 @@
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
<title>World Map</title>
<link rel="stylesheet" type="text/css" href="/DigitalSignage/static/src/css/website_google_map.css"/>
<script src="//code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0="
crossorigin="anonymous"></script>
</head>
<body t-att-data-partner-url="project_url or None">
<script>
+22 -20
View File
@@ -45,10 +45,10 @@
<field name="priority" eval="16"/>
<field name="arch" type="xml">
<tree string="Vertragsstatus">
<field name="color" widget="color"/>
<field name="color" widget="color"/>
<field name="statusname"/>
<field name="icon"/>
<field name="order"/>
<field name="icon"/>
<field name="order" widget="handle"/>
</tree>
</field>
</record>
@@ -61,10 +61,10 @@
<sheet>
<group>
<group name="basethings">
<field name="statusname" string="Statusname"/>
<field name="color" string="Farbindex" widget="color"/>
<field name="icon" string="Icon"/>
<field name="order"/>
<field name="statusname" string="Statusname"/>
<field name="color" string="Farbindex" widget="color"/>
<field name="icon" string="Icon"/>
<field name="order"/>
</group>
</group>
</sheet>
@@ -83,11 +83,11 @@
<field name="priority" eval="16"/>
<field name="arch" type="xml">
<tree string="Werbeaktions-Status">
<field name="color" widget="color"/>
<field name="color" widget="color"/>
<field name="statusname"/>
<field name="func" string="Funktion"/>
<field name="icon"/>
<field name="order"/>
<field name="icon"/>
<field name="order" widget="handle"/>
</tree>
</field>
</record>
@@ -100,12 +100,12 @@
<sheet>
<group>
<group name="basethings">
<field name="statusname" string="Statusname"/>
<field name="func" string="Funktion"/>
<field name="color" string="Farbindex" widget="color"/>
<field name="icon" string="Icon"/>
<field name="order"/>
</group>
<field name="statusname" string="Statusname"/>
<field name="func" string="Funktion"/>
<field name="color" string="Farbindex" widget="color"/>
<field name="icon" string="Icon"/>
<field name="order"/>
</group>
</group>
</sheet>
<div class="oe_chatter">
@@ -123,9 +123,10 @@
<field name="priority" eval="16"/>
<field name="arch" type="xml">
<tree string="Bearbeitungsstatus">
<field name="color" widget="color"/>
<field name="color" widget="color"/>
<field name="statusname"/>
<field name="icon"/>
<field name="icon"/>
<field name="order" widget="handle"/>
</tree>
</field>
</record>
@@ -160,10 +161,11 @@
<field name="priority" eval="16"/>
<field name="arch" type="xml">
<tree string="Bearbeitungsschritte">
<field name="color" widget="color"/>
<field name="color" widget="color"/>
<field name="statusname"/>
<field name="statusnr" string="Statusposition"/>
<field name="icon"/>
<field name="icon"/>
<field name="order" widget="handle"/>
</tree>
</field>
</record>
+7
View File
@@ -214,6 +214,13 @@
action="action_dss_paysystems_view"
sequence="120"/>
<menuitem
id="menu_dss_configuration_payintervals"
name="Zahlungsintervalle verwalten"
parent="menu_dss_div_internsetup"
action="action_dss_main_payintervals"
sequence="130"/>
<menuitem
id="menu_dss_configuration_provisionstypen"
name="Provisionsarten verwalten"