Commit Graph

1417 Commits

Author SHA1 Message Date
Frank Schubert
76d22b47e8 Merge branch 'fronkdev' into 'master'
Added preorderTrigger / added cif api docs

See merge request fronk/thetool!268
2024-02-26 22:14:32 +00:00
Frank Schubert
2af51a2f57 Added preorderTrigger / added cif api docs 2024-02-26 23:13:30 +01:00
Frank Schubert
97d3d8d02f Merge branch 'fronkdev' into 'master'
Added gemeinde filter to Dashboard

See merge request fronk/thetool!267
2024-02-26 12:33:55 +00:00
Frank Schubert
26d022441d Added gemeinde filter to Dashboard 2024-02-26 13:33:15 +01:00
Frank Schubert
c49bb0fc33 Merge branch 'fronkdev' into 'master'
Addded cifurl and -cable url to Preordercampaign

See merge request fronk/thetool!266
2024-02-23 15:38:22 +00:00
Frank Schubert
8fbea5f824 Addded cifurl and -cable url to Preordercampaign 2024-02-23 16:37:12 +01:00
Frank Schubert
67336d632a Merge branch 'fronkdev' into 'master'
2024-02 RML address updates

See merge request fronk/thetool!265
2024-02-22 15:10:35 +00:00
Frank Schubert
ec1d6f803c 2024-02 RML address updates 2024-02-22 16:09:51 +01:00
Frank Schubert
e939630b4a Merge branch 'spidev' into 'master'
Zeiterfassung update

See merge request fronk/thetool!264
2024-02-22 14:13:22 +00:00
Spitzer Daniel
1fee0b1eef Zeiterfassung update
* Autoausfüllen -> fertiggestellt
* Überprüfungen Buchungsüberschneidungen ausgebaut
* Abwesenheitskalender Mouseover eingebaut
* Abwesenheiten ohne Ende Update -> Gesundmeldung generiert nun ein Update mit Ende auf die Abwesenheit
2024-02-22 14:53:48 +01:00
Frank Schubert
6541e32dd9 Merge branch 'fronkdev' into 'master'
Added checks in Product::deleteAction()

See merge request fronk/thetool!263
2024-02-21 15:01:19 +00:00
Frank Schubert
db240354a4 Added checks in Product::deleteAction() 2024-02-21 16:00:41 +01:00
Frank Schubert
b833c57a98 Added checks in Product::deleteAction() 2024-02-21 15:56:15 +01:00
Frank Schubert
b2c0ce6b48 Merge branch 'fronkdev' into 'master'
Products can now be cloned

See merge request fronk/thetool!262
2024-02-21 14:41:55 +00:00
Frank Schubert
de39dd6946 Products can now be cloned 2024-02-21 15:40:59 +01:00
Frank Schubert
d0d78921fb Merge branch 'fronkdev' into 'master'
Added vatgroup_id to product

See merge request fronk/thetool!261
2024-02-21 14:09:54 +00:00
Frank Schubert
0c706f6a0c Added vatgroup_id to product 2024-02-21 15:09:26 +01:00
Frank Schubert
b33407d517 Merge branch 'fronkdev' into 'master'
Fixed Country in BMD Export

See merge request fronk/thetool!260
2024-02-21 12:39:54 +00:00
Frank Schubert
d1cd15935d Fixed Country in BMD Export 2024-02-21 13:39:27 +01:00
Frank Schubert
c5c70a5ccd Merge branch 'fronkdev' into 'master'
Limited VatgroupController to Fibu user

See merge request fronk/thetool!259
2024-02-20 21:38:18 +00:00
Frank Schubert
78916bdd0f Limited VatgroupController to Fibu user 2024-02-20 22:37:47 +01:00
Frank Schubert
06da66bef7 Merge branch 'fronkdev' into 'master'
Added legacy_account in Vatrate

See merge request fronk/thetool!258
2024-02-20 21:26:48 +00:00
Frank Schubert
b0cd82d0dd Added legacy_account in Vatrate 2024-02-20 22:26:20 +01:00
Frank Schubert
6ddad09943 Merge branch 'fronkdev' into 'master'
Added Vatgroup & Vatrate

See merge request fronk/thetool!257
2024-02-20 21:13:25 +00:00
Frank Schubert
7cb5ac6329 Added Vatgroup & Vatrate 2024-02-20 22:12:59 +01:00
Frank Schubert
efbf23d974 Merge branch 'fronkdev' into 'master'
Fixed saving network without adb_netzgebiet_id

See merge request fronk/thetool!256
2024-02-20 20:57:31 +00:00
Frank Schubert
cdb1f1fef7 Fixed saving network without adb_netzgebiet_id 2024-02-20 21:57:04 +01:00
Frank Schubert
80cf3d2fc8 Merge branch 'fronkdev' into 'master'
Address: changed country to country_id with Country table

See merge request fronk/thetool!255
2024-02-20 19:21:37 +00:00
Frank Schubert
20163e6008 Address: changed country to country_id with Country table 2024-02-20 20:20:48 +01:00
Frank Schubert
e1139b6d8e Merge branch 'fronkdev' into 'master'
Added Country table and import script

See merge request fronk/thetool!254
2024-02-20 14:42:38 +00:00
Frank Schubert
c83fc9bcca Added Country table and import script 2024-02-20 15:42:11 +01:00
Frank Schubert
d238ec0335 Merge branch 'spidev' into 'master'
Zeiterfassung update

See merge request fronk/thetool!253
2024-02-19 14:04:19 +00:00
Spitzer Daniel
cdbf9de6fe Zeiterfassung update
* Mails für Antragspflichtige Buchungen
* Mails für Genehmigungen und Ablehnungen
* Korrekturen Update
* Kalender locales hinzugefügt
* Button für autoausfüllen eingebaut

Config update
define("TT_TIMERECORDING_EMAIL","zeiterfassung@xinon.at");
define("TT_TIMERECORDING_EMAIL_NAME","Xinon Zeiterfassung");
2024-02-19 14:52:58 +01:00
Frank Schubert
7c1a6f17b0 Merge branch 'bugfix/raspberrydisplay-auth-fix' into 'master'
Bugfix/raspberrydisplay auth fix

See merge request fronk/thetool!252
2024-02-19 11:55:20 +00:00
0f95b744f0 fixed error 2024-02-19 12:51:58 +01:00
58dbd749f8 fixed raspberry authentication for getConfig and removed IP verifiing 2024-02-19 12:51:34 +01:00
Spitzer Daniel
615fa8d7e6 Zeiterfassung update
* Mails für Antragspflichtige Buchungen
* Mails für Genehmigungen und Ablehnungen
* Korrekturen Update
* Kalender locales hinzugefügt

Config update
define("TT_TIMERECORDING_EMAIL","zeiterfassung@xinon.at");
define("TT_TIMERECORDING_EMAIL_NAME","Xinon Zeiterfassung");
2024-02-18 13:37:32 +01:00
Spitzer Daniel
9a74d50cb5 Zeiterfassung update
* Mails für Antragspflichtige Buchungen
* Mails für Genehmigungen und Ablehnungen
* Korrekturen Update
2024-02-18 13:31:19 +01:00
Spitzer Daniel
d03e31134b Zeiterfassung update
* Kalender Implementation
* Dienstreise Funktionalitäten
2024-02-18 11:36:16 +01:00
Frank Schubert
36b3f1e0f8 Merge branch 'fronkdev' into 'master'
Added robots.txt

See merge request fronk/thetool!251
2024-02-15 20:57:40 +00:00
Frank Schubert
6527c67d31 Added robots.txt 2024-02-15 21:56:17 +01:00
Frank Schubert
81108f7f35 Merge branch 'fronkdev' into 'master'
New Preorder cancelling

See merge request fronk/thetool!250
2024-02-15 19:54:29 +00:00
Frank Schubert
dfa8d7ca1d New Preorder cancelling 2024-02-15 20:44:04 +01:00
Frank Schubert
48ee058660 Merge branch 'fronkdev' into 'master'
Fixed sometimes failing redirect to UserProfile in Router

See merge request fronk/thetool!249
2024-02-15 14:31:46 +00:00
Frank Schubert
0d62e07d3e Fixed sometimes failing redirect to UserProfile in Router 2024-02-15 15:30:19 +01:00
Frank Schubert
d13628f76f Merge branch 'fronkdev' into 'master'
Added Preordercampaign Admin function updateOaidFromUnit()

See merge request fronk/thetool!248
2024-02-14 15:31:27 +00:00
Frank Schubert
0c1e248bc7 Added Preordercampaign Admin function updateOaidFromUnit() 2024-02-14 16:30:42 +01:00
Frank Schubert
c616e2ab77 Merge branch 'fronkdev' into 'master'
Added mureck to preorder scripts

See merge request fronk/thetool!247
2024-02-14 14:36:25 +00:00
Frank Schubert
cb5df1783a Added mureck to preorder scripts 2024-02-14 15:35:09 +01:00
Frank Schubert
5d65740330 Fixed Type in translation file 2024-02-14 15:32:18 +01:00