Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity
4,221 Commits 7 Branches 0 Tags
f6c79b18b3a51711582d5cd26a521db8776d87d0
Commit Graph
4221 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Luca Haid a4a493ed92 add new import columns 2025-05-12 12:42:53 +02:00
Luca Haid 07db6d3a79 Merge branch 'ConstructionConsent/add-new-import-cols' into 'master' 
add new import columns

See merge request fronk/thetool!1314
 2025-05-12 07:42:40 +00:00
Luca Haid 003ed5d66a add new import columns 2025-05-12 09:41:45 +02:00
Daniel Spitzer 333d358be1 Merge branch 'spidev' into 'master' 
Zeiterfassung Bugfix Zeiterfassung

See merge request fronk/thetool!1313
 2025-05-11 18:50:21 +00:00
Daniel Spitzer 7739d90e77 Zeiterfassung Bugfix Zeiterfassung 
* bei der Zeiterfassung wenn man Fibu Rechte hat, darf man mit ZA ins Minus gehen das hat aber den Bug gehabt, dass wenn man überstunden hat die Überstunden ins Minus geht das Verrechnunstechnisch nicht möglich ist. Alles was über das gesamtzeitguthaben drüber schießt wird nun negativ in die Mehrstunden verbucht.
 2025-05-11 20:49:11 +02:00
Daniel Spitzer 4a264946f6 Merge branch 'spidev' into 'master' 
Pop Feature Erweiterungen

See merge request fronk/thetool!1312
 2025-05-11 17:55:00 +00:00
Daniel Spitzer 09aaede76b Pop Feature Erweiterungen 
* Project 8454 (Erweiterung Felder Status, Speicherort, Dokustand Datum)
* Schrank breite um 1ne Col verbreitert
* neue Migration
 2025-05-11 19:53:31 +02:00
Frank Schubert 615b1434a2 added "after" to woker_add_active migration 2025-05-09 13:28:42 +02:00
Frank Schubert 52b8462afc WIP Mass Productchange 2025-05-08 20:08:09 +02:00
Frank Schubert 14bcb7b3c2 Merge branch 'fronkdev' into 'master' 
Added Borderpoint status to Preorder

See merge request fronk/thetool!1311
 2025-05-07 16:33:42 +00:00
Frank Schubert 678544ced7 Added Borderpoint status to Preorder 2025-05-07 18:33:20 +02:00
Luca Haid 53fae3ef16 Merge branch 'WarehouseEShop/fix-article-packet-matching' into 'master' 
added new field trio article number

See merge request fronk/thetool!1310
 2025-05-07 15:44:34 +00:00
Luca Haid fe86d140ac added new field trio article number 2025-05-07 17:44:25 +02:00
Luca Haid c873bb4c2e Merge branch 'WarehouseEShop/fix-article-packet-matching' into 'master' 
added new field trio article number

See merge request fronk/thetool!1309
 2025-05-07 14:50:36 +00:00
Luca Haid 89a02a38c7 added new field trio article number 2025-05-07 16:50:24 +02:00
Luca Haid becf39cc24 Merge branch 'WarehouseEShop/fix-article-packet-matching' into 'master' 
added new field trio article number

See merge request fronk/thetool!1308
 2025-05-07 14:46:59 +00:00
Luca Haid 5a0a6ced95 added new field trio article number 2025-05-07 16:46:49 +02:00
Luca Haid c363cb4c52 Merge branch 'WarehouseEShop/fix-article-packet-matching' into 'master' 
added new field trio article number

See merge request fronk/thetool!1307
 2025-05-07 14:39:26 +00:00
Luca Haid 86e1983dc2 added new field trio article number 2025-05-07 16:39:15 +02:00
Luca Haid faf7a5da79 Merge branch 'WarehouseEShop/fix-article-packet-matching' into 'master' 
-

See merge request fronk/thetool!1306
 2025-05-07 14:32:12 +00:00
Luca Haid b67cc642a3 - 2025-05-07 16:31:30 +02:00
Luca Haid 274b892c2f Merge branch 'ConstructionConsent/add-export' into 'master' 
added export feature constr consent

See merge request fronk/thetool!1305
 2025-05-07 12:16:26 +00:00
Luca Haid 27727c0c92 added export feature constr consent 2025-05-07 14:16:16 +02:00
Frank Schubert 52c3d00b93 Merge branch 'fronkdev' into 'master' 
Rounding prices in AddressdbAPI getAddressPricing

See merge request fronk/thetool!1304
 2025-05-07 12:13:09 +00:00
Frank Schubert c7ce28acf8 Rounding prices in AddressdbAPI getAddressPricing 2025-05-07 14:11:45 +02:00
Luca Haid a9a45afa64 Merge branch 'ConstructionConsent/add-export' into 'master' 
added export feature constr consent

See merge request fronk/thetool!1303
 2025-05-07 12:07:22 +00:00
Luca Haid 5061255a01 added export feature constr consent 2025-05-07 14:07:08 +02:00
Frank Schubert 4db4577c28 Merge branch 'fronkdev' into 'master' 
saving editor in afterUpdate in Building

See merge request fronk/thetool!1302
 2025-05-07 11:35:35 +00:00
Frank Schubert a796e5d58b saving editor in afterUpdate in Building 2025-05-07 13:17:41 +02:00
Luca Haid 072d0c82c1 Merge branch 'ConstructionConsent/add-netzgebiet-id' into 'master' 
fixed saveaction

See merge request fronk/thetool!1301
 2025-05-07 08:02:52 +00:00
Luca Haid 22ec1e3434 fixed saveaction 2025-05-07 10:02:36 +02:00
Luca Haid 04984f6e87 Merge branch 'ConstructionConsent/add-netzgebiet-id' into 'master' 
fixed saveaction

See merge request fronk/thetool!1300
 2025-05-07 07:59:33 +00:00
Luca Haid 0156d25a6c fixed saveaction 2025-05-07 09:59:15 +02:00
Luca Haid d1b0ae426b Merge branch 'ConstructionConsent/add-netzgebiet-id' into 'master' 
-

See merge request fronk/thetool!1299
 2025-05-06 14:04:09 +00:00
Luca Haid a835cc75b4 - 2025-05-06 16:03:50 +02:00
Luca Haid ee29285a25 Merge branch 'ConstructionConsent/add-netzgebiet-id' into 'master' 
-

See merge request fronk/thetool!1298
 2025-05-06 13:58:47 +00:00
Luca Haid 6993c530dc - 2025-05-06 15:58:38 +02:00
Luca Haid b368c4e328 Merge branch 'ConstructionConsent/add-netzgebiet-id' into 'master' 
-

See merge request fronk/thetool!1297
 2025-05-06 13:57:52 +00:00
Luca Haid dd5feecde1 - 2025-05-06 15:57:33 +02:00
Frank Schubert fffa757468 Merge branch 'fronkdev' into 'master' 
Ignoring cancelled orders when counting workorders in Preordercampaign

See merge request fronk/thetool!1296
 2025-05-06 13:47:29 +00:00
Frank Schubert e261b299ce Ignoring cancelled orders when counting workorders in Preordercampaign 2025-05-06 15:46:57 +02:00
Frank Schubert 29d92e3a16 Merge branch 'fronkdev' into 'master' 
Ignoring deleted and cancelled Workorders in PreorderModel

See merge request fronk/thetool!1295
 2025-05-06 13:45:20 +00:00
Frank Schubert c32d811852 Ignoring deleted and cancelled Workorders in PreorderModel 2025-05-06 15:44:17 +02:00
Luca Haid daddee1b8f Merge branch 'add-bookstack-integration' into 'master' 
Add bookstack integration

See merge request fronk/thetool!1294
 2025-05-06 11:27:44 +00:00
Luca Haid d001c81736 Add bookstack integration 2025-05-06 11:27:44 +00:00
Luca Haid 230f324ebf Merge branch 'ConstructionConsent/fix-back-button' into 'master' 
-

See merge request fronk/thetool!1292
 2025-05-06 10:30:10 +00:00
Luca Haid 84553ad413 - 2025-05-06 12:29:51 +02:00
Luca Haid 08a53ea5b1 Merge branch 'ConstructionConsent/add-new' into 'master' 
-

See merge request fronk/thetool!1291
 2025-05-06 09:29:15 +00:00
Luca Haid 265f07ed53 - 2025-05-06 11:28:55 +02:00
Frank Schubert cdf2c3ad9a Merge branch 'fronkdev' into 'master' 
Added new numbers to Voicenumbercheck ignorelist

See merge request fronk/thetool!1290
 2025-05-05 11:31:18 +00:00