Commit Graph

4183 Commits

Author SHA1 Message Date
Frank Schubert
bf638a7991 added customer_number 2025-07-16 17:39:50 +02:00
Frank Schubert
5e196f0110 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2025-07-16 17:37:38 +02:00
Frank Schubert
d689b21ab4 added script to list missing document files 2025-07-16 17:37:12 +02: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
202a7fd478 Added basic Citycom ADB Import 2025-07-15 16:48:04 +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
Luca Haid
6aa48916f9 Merge branch 'AssetManagement/add-multiple-image-feature' into 'master'
added multiple images feature for asset mgmt

See merge request fronk/thetool!1528
2025-07-09 10:54:57 +00:00
Luca Haid
a0a7d92aa5 added multiple images feature for asset mgmt 2025-07-09 12:54:01 +02:00
Frank Schubert
18bc10fc46 Merge branch 'fronkdev' into 'master'
PreorderApi:getAllPreorders: new optional parameter include_deleted

See merge request fronk/thetool!1527
2025-07-09 10:35:24 +00:00
Frank Schubert
c282b50ce8 PreorderApi:getAllPreorders: new optional parameter include_deleted 2025-07-09 12:34:22 +02:00
Frank Schubert
9c0778600d Merge branch 'fronkdev' into 'master'
Added payment_due and skonto to Address and Invoice

See merge request fronk/thetool!1526
2025-07-08 16:35:10 +00:00
Frank Schubert
0109817148 Added payment_due and skonto to Address and Invoice 2025-07-08 18:34:07 +02:00
Daniel Spitzer
d5bb91925f Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!1525
2025-07-08 16:08:12 +00:00
Daniel Spitzer
52f384c7ba Zeiterfassung
* Anpassungen Urlaubsanzeige bei Arbeitszeitänderungen
2025-07-08 18:02:23 +02:00
Frank Schubert
2965265ff8 Merge branch 'fronkdev' into 'master'
Fixed sometimes not running Preorder triggers from rimo import

See merge request fronk/thetool!1524
2025-07-08 11:12:55 +00:00
Frank Schubert
b54323237d Fixed sometimes not running Preorder triggers from rimo import 2025-07-08 13:12:11 +02:00
Frank Schubert
0637125b86 Merge branch 'fronkdev' into 'master'
PreorderBilling: activation_billing now also works for operator_setup

See merge request fronk/thetool!1523
2025-07-07 12:25:30 +00:00
Frank Schubert
086f1b5969 Removed debugging in VodiaApi 2025-07-07 14:25:01 +02:00
Frank Schubert
f166f746c5 RimoWorkorder: now setting dynamic properties to null in afterSave() 2025-07-07 14:23:53 +02:00
Frank Schubert
d3602100a0 PreorderBilling: activation_billing now also works for operator_setup 2025-07-07 14:23:00 +02:00
Luca Haid
45b0ef3e47 Merge branch 'Preorder/fix-pagination' into 'master'
fixed pagination

See merge request fronk/thetool!1522
2025-07-07 12:10:58 +00:00
Luca Haid
27b8350f55 fixed pagination 2025-07-07 14:10:35 +02:00
Frank Schubert
c47e9e5941 Merge branch 'fronkdev' into 'master'
rimo-import: changing workorders wohneinheit_id if current home not found

See merge request fronk/thetool!1521
2025-07-07 10:14:44 +00:00
Frank Schubert
8524a5ec93 rimo-import: changing workorders wohneinheit_id if current home not found 2025-07-07 12:13:27 +02:00
Frank Schubert
abb37ddbf9 Merge branch 'fronkdev' into 'master'
PreorderBilling: Changed RML address in emails and PDFs

See merge request fronk/thetool!1520
2025-07-07 06:34:04 +00:00