Commit Graph

3394 Commits

Author SHA1 Message Date
Frank Schubert
6dee3ce4e3 Merge branch 'fronkdev' into 'master'
PreorderBilling: Added ANB invoicing emails from config file

See merge request fronk/thetool!1160
2025-04-01 18:58:46 +00:00
Frank Schubert
b4a9d846f3 PreorderBilling: Added ANB invoicing emails from config file 2025-04-01 20:56:14 +02:00
Frank Schubert
1d3be2252c Merge branch 'fronkdev' into 'master'
Added numbers to ignore in VoiceCallHistory::addContractIds()

See merge request fronk/thetool!1159
2025-04-01 15:57:28 +00:00
Frank Schubert
686f3d1ed0 Added numbers to ignore in VoiceCallHistory::addContractIds() 2025-04-01 17:56:41 +02:00
Luca Haid
21fe2565a1 Merge branch 'RimoFCP/integrate' into 'master'
fixed using correct credentials

See merge request fronk/thetool!1158
2025-04-01 13:26:38 +00:00
Luca Haid
68f6666ca6 fixed using correct credentials 2025-04-01 15:26:18 +02:00
Luca Haid
29c31f18f4 Merge branch 'RimoFCP/integrate' into 'master'
Added FCPs to TheTool

See merge request fronk/thetool!1157
2025-04-01 13:19:59 +00:00
Luca Haid
97529ba95f Added FCPs to TheToolAdded WarehouseOffer and WarehouseOfferTemplate, also fixed menu for Lager Point 2025-04-01 15:19:18 +02:00
Luca Haid
5e01b64c25 Update Index.php 2025-04-01 09:54:48 +00:00
Luca Haid
a802ff8e05 Merge branch 'Warehouse/fix-and-improve' into 'master'
Added WarehouseOffer and WarehouseOfferTemplate, also fixed menu for Lager Point

See merge request fronk/thetool!1156
2025-03-31 13:14:15 +00:00
Luca Haid
e842d37f98 Added WarehouseOffer and WarehouseOfferTemplate, also fixed menu for Lager Point 2025-03-31 15:13:34 +02:00
Luca Haid
757db66025 Merge branch 'Warehouse/fix-and-improve' into 'master'
Fixed Article Packets and Shipping Note Text Entry

See merge request fronk/thetool!1155
2025-03-31 12:23:09 +00:00
Luca Haid
d33d93867f Fixed Article Packets and Shipping Note Text Entry 2025-03-31 14:22:44 +02:00
Frank Schubert
6988536bde Merge branch 'fronkdev' into 'master'
PreorderBilling

See merge request fronk/thetool!1154
2025-03-31 11:51:27 +00:00
Frank Schubert
17405c8c5d PreorderBilling 2025-03-31 13:50:49 +02:00
Frank Schubert
bc3b2aea7f Merge branch 'fronkdev' into 'master'
added magenta activation date import script

See merge request fronk/thetool!1153
2025-03-29 19:52:28 +00:00
Frank Schubert
21655c5ff4 added magenta activation date import script 2025-03-29 20:51:44 +01:00
Frank Schubert
6786e557b2 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2025-03-28 13:43:31 +01:00
Frank Schubert
2fa0d31837 WIP Preorder Billing 2025-03-27 2025-03-28 13:43:11 +01:00
Frank Schubert
60123d71f3 Merge branch 'fronkdev' into 'master'
Preorderlogistics: changed connection_type filter to unit_count

See merge request fronk/thetool!1152
2025-03-28 11:46:33 +00:00
Frank Schubert
e66d96a097 Preorderlogistics: changed connection_type filter to unit_count 2025-03-28 12:45:39 +01:00
Frank Schubert
6fa53e1a41 Merge branch 'fronkdev' into 'master'
Added RTR Acitve Numbers Report

See merge request fronk/thetool!1151
2025-03-28 11:04:22 +00:00
Frank Schubert
a72d07eeb9 Added RTR Acitve Numbers Report 2025-03-28 12:03:47 +01:00
Frank Schubert
ff765746fa Merge branch 'fronkdev' into 'master'
Added PreorderPrice exception for Kienach 9 on RML request

See merge request fronk/thetool!1150
2025-03-27 09:38:03 +00:00
Frank Schubert
b8db830214 Added PreorderPrice exception for Kienach 9 on RML request 2025-03-27 10:37:06 +01:00
Frank Schubert
300aeb2a12 Merge branch 'fronkdev' into 'master'
Not changing status to hausnummer status when saving Preorder in existing orders

See merge request fronk/thetool!1149
2025-03-26 15:12:08 +00:00
Frank Schubert
dbbce904a5 Not changing status to hausnummer status when saving Preorder in existing orders 2025-03-26 16:11:13 +01:00
Frank Schubert
82ebd52915 Merge branch 'fronkdev' into 'master'
Fronkdev

See merge request fronk/thetool!1148
2025-03-26 15:06:42 +00:00
Frank Schubert
3bee393f09 Disabled billed-button in Preorder/Index for now 2025-03-26 14:10:55 +01:00
Frank Schubert
50d24faf9f Rimo FCP import draft 2025-03-26 14:07:14 +01:00
Frank Schubert
e3a6d494ef WIP PreorderBilling 2025-03-26 2025-03-26 14:06:23 +01:00
Luca Haid
02ce43279f Merge branch 'Preorderlogistics/only-show-status-140' into 'master'
only show status 140

See merge request fronk/thetool!1147
2025-03-26 11:04:39 +00:00
Luca Haid
af1c716998 only show status 140 2025-03-26 12:03:47 +01:00
Luca Haid
21f3677429 Merge branch 'Preorderlogistics/make-working' into 'master'
made preorderlogistics working again

See merge request fronk/thetool!1146
2025-03-25 16:15:21 +00:00
Luca Haid
39c54a86f9 made preorderlogistics working again 2025-03-25 17:14:49 +01:00
Luca Haid
2c59a5c6c4 Merge branch 'Preorderlogistics/make-working' into 'master'
made preorderlogistics working again

See merge request fronk/thetool!1145
2025-03-25 16:13:27 +00:00
Luca Haid
33b36c6296 made preorderlogistics working again 2025-03-25 17:13:08 +01:00
Frank Schubert
f5c1fca9c5 Update ConstructionConsentOwner.php - forcestr 2025-03-25 15:28:03 +00:00
Frank Schubert
fa2160be3b Update ConstructionConsentContact.php - forcestr 2025-03-25 15:27:33 +00:00
Luca Haid
7b7bf8028d Merge branch 'ConstructionConsent/added-new-features' into 'master'
added new features

See merge request fronk/thetool!1144
2025-03-25 14:25:34 +00:00
Luca Haid
83c5b11987 added new features 2025-03-25 15:25:07 +01:00
Luca Haid
e9a61eac78 Merge branch 'ConstructionConsent/added-new-features' into 'master'
added new features

See merge request fronk/thetool!1143
2025-03-25 12:49:50 +00:00
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
Luca Haid
af6a4e02f5 added new features 2025-03-25 13:49:16 +01: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