Commit Graph

4202 Commits

Author SHA1 Message Date
Luca Haid
072e5d76c6 Merge branch 'ConstructionConsent/fix-bugs' into 'master'
Construction consent/fix bugs

See merge request fronk/thetool!1549
2025-07-16 15:13:44 +00:00
Luca Haid
2e4895dc84 Construction consent/fix bugs 2025-07-16 15:13:43 +00:00
Luca Haid
a4f57fbf8f Merge branch 'ConstructionConsent/fix-bugs' into 'master'
Construction consent/fix bugs

See merge request fronk/thetool!1548
2025-07-16 15:06:59 +00:00
Luca Haid
3d62097d36 Construction consent/fix bugs 2025-07-16 15:06:59 +00:00
Luca Haid
b1ca0624ea Merge branch 'ConstructionConsent/fix-bugs' into 'master'
fixed import bugs and filter

See merge request fronk/thetool!1547
2025-07-16 14:53:52 +00:00
Luca Haid
9da44c7397 fixed import bugs and filter 2025-07-16 14:53:51 +00:00
Luca Haid
4b417ef2d1 Update WarehouseOffer.js 2025-07-16 13:41:23 +00:00
Luca Haid
a955ba4f6b Merge branch 'PreorderIFrame/remove-invoice-for-interest' into 'master'
hiding inv addr

See merge request fronk/thetool!1546
2025-07-16 11:21:23 +00:00
Luca Haid
80b3856b70 hiding inv addr 2025-07-16 13:20:56 +02:00
Frank Schubert
782ce6bd08 Merge branch 'fronkdev' into 'master'
Adding non-rimo clusters to cluster list in adb import broker

See merge request fronk/thetool!1545
2025-07-16 10:17:22 +00:00
Frank Schubert
b33f4bc918 Adding non-rimo clusters to cluster list in adb import broker 2025-07-16 12:16:40 +02:00
Frank Schubert
cdd6f7de49 Merge branch 'fronkdev' into 'master'
Added basic Citycom ADB Import

See merge request fronk/thetool!1544
2025-07-15 14:48:40 +00:00
Frank Schubert
202a7fd478 Added basic Citycom ADB Import 2025-07-15 16:48:04 +02:00
Luca Haid
bcd8f4ba56 refactored code more beautifully 2025-07-15 12:18:21 +00:00
Luca Haid
4277846dc5 Fixed calculations rounding 2025-07-15 12:17:17 +00:00
Luca Haid
325bf5a582 WarehouseOffer PDF Cleaner View 2025-07-15 12:13:45 +00:00
Luca Haid
ae5df0fc7c Merge branch 'PreorderIFrame/enable-without-wohneinheit' into 'master'
enabled creating interest preorders without any wohneinheit

See merge request fronk/thetool!1543
2025-07-15 12:03:36 +00:00
Luca Haid
6d7260f917 enabled creating interest preorders without any wohneinheit 2025-07-15 14:03:23 +02:00
Luca Haid
26c0afce5d Merge branch 'WarehouseOffer/v2' into 'master'
warehouseoffer v2

See merge request fronk/thetool!1542
2025-07-15 11:02:54 +00:00
Luca Haid
5a559b3055 warehouseoffer v2 2025-07-15 13:02:43 +02:00
Luca Haid
d9d1d98cc4 Merge branch 'WarehouseOffer/v2' into 'master'
warehouseoffer v2

See merge request fronk/thetool!1541
2025-07-15 10:57:53 +00:00
Luca Haid
11e4d4b270 warehouseoffer v2 2025-07-15 12:57:41 +02:00
Luca Haid
5609e73923 Merge branch 'PreorderIFrame/add-new-capabilities' into 'master'
added new capabilities in iframe

See merge request fronk/thetool!1540
2025-07-15 07:18:04 +00:00
Luca Haid
72ff13e621 added new capabilities in iframe 2025-07-15 09:17:26 +02:00
Luca Haid
4148e1749f Merge branch 'Warehouse/improve' into 'master'
improved new warehouse stuff

See merge request fronk/thetool!1539
2025-07-14 08:28:15 +00:00
Luca Haid
73ff3003fd improved new warehouse stuff 2025-07-14 10:27:53 +02:00
Luca Haid
0ef289c828 Update WarehouseOfferModel.php 2025-07-14 06:53:00 +00:00
Luca Haid
c43df46d43 Fixed Network_id filter 2025-07-14 05:44:02 +00:00
Frank Schubert
c3eaf57034 Merge branch 'fronkdev' into 'master'
rimo-import: Fixed setting unscheduled (Not2Connect/Gross Planning)

See merge request fronk/thetool!1538
2025-07-11 09:33:47 +00:00
Frank Schubert
da20bc1808 rimo-import: Fixed setting unscheduled (Not2Connect/Gross Planning) 2025-07-11 11:33:04 +02:00
Luca Haid
b926cf490b Merge branch 'AssetManagement/add-external-text-field' into 'master'
Asset management/add external text field

See merge request fronk/thetool!1537
2025-07-11 08:55:11 +00:00
Luca Haid
fb7a373ea3 Asset management/add external text field 2025-07-11 08:55:11 +00:00
Frank Schubert
42adbdbc67 Merge branch 'fronkdev' into 'master'
rimo-import: setting "unscheduled" if grossPlanning and Not2Connect

See merge request fronk/thetool!1536
2025-07-10 14:17:59 +00:00
Frank Schubert
a33a3cea75 rimo-import: setting "unscheduled" if grossPlanning and Not2Connect 2025-07-10 16:16:12 +02:00
Luca Haid
23c659c0e8 Update WarehouseOrder.js 2025-07-10 13:59:35 +00:00
Frank Schubert
86d32aed55 Merge branch 'fronkdev' into 'master'
removing PStatusNotifyLog entry when updateing Order Date

See merge request fronk/thetool!1535
2025-07-10 12:57:45 +00:00
Frank Schubert
be94e29d08 removing PStatusNotifyLog entry when updateing Order Date 2025-07-10 14:55:48 +02:00
Frank Schubert
ef69833ccc PreorderBilling: Fixed rounding of totals 2025-07-10 13:53:51 +02:00
Luca Haid
c4409a08cd Merge branch 'File/add-new-thumbnail-generating-method' into 'master'
added new thumbnail generation

See merge request fronk/thetool!1534
2025-07-10 11:17:37 +00:00
Luca Haid
a322f32f88 added new thumbnail generation 2025-07-10 13:17:19 +02:00
Luca Haid
2b0e662190 Merge branch 'Warehouse/improve2' into 'master'
improved multiple warehouse stuff

See merge request fronk/thetool!1533
2025-07-10 11:07:52 +00:00
Luca Haid
2e5cbea612 improved multiple warehouse stuff 2025-07-10 13:07:39 +02:00
Luca Haid
8b096a6b8c Merge branch 'AssetManagement/add-multiple-pic-viewer' into 'master'
added multiple pic viewer and additional fixes

See merge request fronk/thetool!1532
2025-07-10 09:59:14 +00:00
Luca Haid
02a47fa0b2 added multiple pic viewer and additional fixes 2025-07-10 11:58:44 +02:00
Luca Haid
081c548bd9 Merge branch 'Patching/fix-pop-bug' into 'master'
fixed bug in patching

See merge request fronk/thetool!1531
2025-07-10 09:44:27 +00:00
Luca Haid
30f19e242e fixed bug in patching 2025-07-10 11:39:21 +02:00
Luca Haid
2e7102fb23 Merge branch 'Preorder/add-new-table' into 'master'
added new custom 300 table

See merge request fronk/thetool!1530
2025-07-09 13:36:14 +00:00
Luca Haid
40fcff65f5 added new custom 300 table 2025-07-09 15:35:59 +02:00
Frank Schubert
588cf60bc0 Merge branch 'fronkdev' into 'master'
Fixed link to PreorderDiscount in PreorderCampaign

See merge request fronk/thetool!1529
2025-07-09 13:12:07 +00:00
Frank Schubert
08f5765763 Fixed link to PreorderDiscount in PreorderCampaign 2025-07-09 15:11:38 +02:00