Commit Graph
3351 Commits
Author SHA1 Message Date
Frank Schubert faf837e2eb Merge branch 'fronkdev' into 'master'
Added Button to link to PreorderBillingInvoice from PreoderBilling

See merge request fronk/thetool!1142
2025-03-25 12:49:29 +00:00
Frank Schubert c73c2e2a86 Added Button to link to PreorderBillingInvoice from PreoderBilling 2025-03-25 13:48:51 +01:00
Luca Haid 0448daaf59 Merge branch 'ConstructionConsent/add-permission' into 'master'
fixed menu

See merge request fronk/thetool!1141
2025-03-25 09:44:18 +00:00
Luca Haid c94d7de181 fixed menu 2025-03-25 10:43:59 +01:00
Luca Haid 2dfa4e34b2 Merge branch 'ConstructionConsent/add-permission' into 'master'
added contact edit button

See merge request fronk/thetool!1140
2025-03-25 09:41:34 +00:00
Luca Haid b429862948 added contact edit button 2025-03-25 10:41:19 +01:00
Luca Haid 120d3cab4a Merge branch 'ConstructionConsent/add-permission' into 'master'
added contact edit button

See merge request fronk/thetool!1139
2025-03-25 09:38:52 +00:00
Luca Haid 321726718f added contact edit button 2025-03-25 10:38:20 +01:00
Luca Haid aa7f0c9108 Merge branch 'ConstructionConsent/add-edit-button' into 'master'
added contact edit button

See merge request fronk/thetool!1138
2025-03-25 07:33:01 +00:00
Luca Haid 7be3446383 added contact edit button 2025-03-25 08:32:25 +01:00
Frank Schubert 35b6bfcf58 Merge branch 'fronkdev' into 'master'
Preorder Billing Marketshare Price + RML layout tweaks

See merge request fronk/thetool!1137
2025-03-24 17:38:37 +00:00
Frank Schubert 40f92c3b7c Preorder Billing Marketshare Price + RML layout tweaks 2025-03-24 18:37:33 +01:00
Luca Haid 2d5c4e8690 Update WarehouseShippingNoteController.php 2025-03-24 13:53:06 +00:00
Luca Haid cccdede1de Merge branch 'WarehouseShippingNote/improve' into 'master'
Fixed Issue with PDF and Typing

See merge request fronk/thetool!1136
2025-03-24 12:11:08 +00:00
Luca Haid 6c946cd137 Fixed Issue with PDF and Typing 2025-03-24 13:10:42 +01:00
Luca Haid 5e2824b50c Update WarehouseShippingNote.js 2025-03-24 08:53:26 +00:00
Luca Haid 390165bc5e Update WarehouseShippingNote.js 2025-03-24 08:51:10 +00:00
Luca Haid a56e212085 Update WarehouseShippingNote.js 2025-03-24 08:48:24 +00:00
Frank Schubert ae5e1e4706 Merge branch 'fronkdev' into 'master'
added CSV file generation for RML Billing

See merge request fronk/thetool!1135
2025-03-22 17:24:05 +00:00
Frank Schubert 97c7a1dde5 added CSV file generation for RML Billing 2025-03-22 18:23:28 +01:00
Frank Schubert 6027a4dc6e Merge branch 'fronkdev' into 'master'
RML Invoice Layout Tweaks

See merge request fronk/thetool!1134
2025-03-22 16:32:07 +00:00
Frank Schubert 5ff67da367 RML Invoice Layout Tweaks 2025-03-22 17:31:37 +01:00
Frank Schubert f509364bd9 Merge branch 'fronkdev' into 'master'
RML Invoice Layout tweaks

See merge request fronk/thetool!1133
2025-03-22 15:48:29 +00:00
Frank Schubert 5c04e35d90 RML Invoice Layout tweaks 2025-03-22 16:47:57 +01:00
Frank Schubert 8f2ca1ccc3 Merge branch 'fronkdev' into 'master'
WIP PreorderBilling 2025-03-22

See merge request fronk/thetool!1132
2025-03-22 13:51:14 +00:00
Frank Schubert 217b19026e WIP PreorderBilling 2025-03-22 2025-03-22 14:50:08 +01:00
Luca Haid aebb463b74 Merge branch 'WarehouseShippingNote/add-viewer-mode' into 'master'
Added viewer mode

See merge request fronk/thetool!1131
2025-03-21 11:12:31 +00:00
Luca Haid 5b8441dde1 Added viewer mode 2025-03-21 12:08:03 +01:00
Luca Haid b8649a77e2 Fixed Ingena Permission 2025-03-21 10:14:11 +00:00
Luca Haid 2dc3509ff7 Fixed position-manager 2025-03-21 09:30:26 +00:00
Luca Haid ff01974efa Merge branch 'WarehouseShippingNote/remove-console-log' into 'master'
Removed Console Logs

See merge request fronk/thetool!1130
2025-03-21 08:11:44 +00:00
Luca Haid e319f2bf10 Removed Console Logs 2025-03-21 09:11:10 +01:00
Luca Haid 36a1519ff6 Merge branch 'WarehouseShippingNote/fix-hour-entry' into 'master'
Updated Shipping Note

See merge request fronk/thetool!1129
2025-03-21 08:02:25 +00:00
Luca Haid 027338f93d Updated Shipping Note 2025-03-21 09:01:47 +01:00
Frank Schubert c3794beceb Merge branch 'fronkdev' into 'master'
ADB addresses can be deleted now

See merge request fronk/thetool!1128
2025-03-20 19:00:00 +00:00
Frank Schubert 0a1c1de44b ADB addresses can be deleted now 2025-03-20 19:59:18 +01:00
Frank Schubert 2d19758313 Merge branch 'fronkdev' into 'master'
PreorderBilling WIP & Api changed

See merge request fronk/thetool!1127
2025-03-20 15:03:17 +00:00
Frank Schubert 9353591421 PreorderBilling WIP & Api changed 2025-03-20 16:02:05 +01:00
Luca Haid 88ddd21098 Merge branch 'WarehouseShippingNote/add-customer-search' into 'master'
Updated Shipping Note

See merge request fronk/thetool!1126
2025-03-20 13:49:14 +00:00
Luca Haid d9a2ba1ef4 Updated Shipping Note 2025-03-20 14:48:54 +01:00
Luca Haid 3f8be39626 Merge branch 'WarehouseShippingNote/add-loader' into 'master'
Updated Shipping Note

See merge request fronk/thetool!1125
2025-03-20 13:18:57 +00:00
Luca Haid b293167527 Updated Shipping Note 2025-03-20 14:09:23 +01:00
Luca Haid 438cd85d5f Merge branch 'ShippingNote/rework' into 'master'
Shipping note/rework

See merge request fronk/thetool!1124
2025-03-20 12:14:35 +00:00
Luca Haid d6d84088fb Shipping note/rework 2025-03-20 12:14:34 +00:00
Luca Haid 96ed8caaeb Update PreorderModel.php 2025-03-20 08:41:29 +00:00
Luca Haid 5fb3a3d789 Update PreorderModel.php 2025-03-20 08:39:08 +00:00
Luca Haid 20e1740ad5 Update PreorderModel.php 2025-03-20 08:37:39 +00:00
Daniel Spitzer 9a07c3f7e7 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1123
2025-03-19 14:18:59 +00:00
Daniel Spitzer 226bb7e4db Zeiterfassung Update
* Anpassungen der Journaleintrag Form
2025-03-19 15:16:53 +01:00
Daniel Spitzer 65866d4e11 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1122
2025-03-18 15:45:53 +00:00