Commit Graph

4272 Commits

Author SHA1 Message Date
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
Frank Schubert
57b2357acd Added new numbers to Voicenumbercheck ignorelist 2025-05-05 13:30:44 +02:00
Luca Haid
8a8e4ad064 Merge branch 'WarehouseShippingNote/fix-km-count' into 'master'
-

See merge request fronk/thetool!1289
2025-05-05 10:20:56 +00:00
Luca Haid
4c4dc1b00c - 2025-05-05 12:16:24 +02:00
Luca Haid
45d0279490 Merge branch 'WarehouseShippingNote/fix-km-count' into 'master'
-

See merge request fronk/thetool!1288
2025-05-05 10:09:12 +00:00
Luca Haid
a33a4e861b - 2025-05-05 12:08:57 +02:00
Luca Haid
b2d0407298 Merge branch 'ConstructionConsent/ordering' into 'master'
fixed ordering

See merge request fronk/thetool!1287
2025-04-30 14:01:39 +00:00
Luca Haid
1221c35650 fixed ordering 2025-04-30 16:01:19 +02:00
Daniel Spitzer
3c09b66605 Merge branch 'spidev' into 'master'
Kalender Update Feature Erweiterung

See merge request fronk/thetool!1286
2025-04-30 11:01:30 +00:00
Daniel Spitzer
4ec4e15e05 Kalender Update Feature Erweiterung
* Absage von Kundenterminen

Behobene Bugfixes:
* Beschreibungsfeld kann nun immer Leer gesetzt werden.
* SPIN wird nun nur 1mal ins Beschreibungsfeld eingesetzt.
2025-04-30 12:58:36 +02:00
Luca Haid
b49fcc14ce Merge branch 'ConstructionConsent/ordering' into 'master'
fixed ordering

See merge request fronk/thetool!1285
2025-04-30 10:45:34 +00:00
Luca Haid
f17cf770db fixed ordering 2025-04-30 12:45:22 +02:00
Luca Haid
185509fe81 Merge branch 'select2/add' into 'master'
fixed device

See merge request fronk/thetool!1284
2025-04-30 10:30:51 +00:00
Luca Haid
0c6380fe5d fixed device 2025-04-30 12:30:35 +02:00
Luca Haid
1e87b2d66d Merge branch 'Warehouse/improve3' into 'master'
fixed device

See merge request fronk/thetool!1283
2025-04-29 13:22:17 +00:00
Luca Haid
8ef3c6ec65 fixed device 2025-04-29 15:22:07 +02:00
Luca Haid
182beb2967 Merge branch 'Warehouse/improve3' into 'master'
improved new features

See merge request fronk/thetool!1282
2025-04-29 12:17:00 +00:00
Luca Haid
7343571af7 improved new features 2025-04-29 14:16:51 +02:00
Luca Haid
fc230fdb35 Merge branch 'Warehouse/improve3' into 'master'
improved new features

See merge request fronk/thetool!1281
2025-04-29 12:14:45 +00:00
Luca Haid
f2dc7eae53 improved new features 2025-04-29 14:14:30 +02:00
Luca Haid
10169bd45b Merge branch 'Warehouse/improve3' into 'master'
improved new features

See merge request fronk/thetool!1280
2025-04-29 12:11:33 +00:00
Luca Haid
a859bef97e improved new features 2025-04-29 14:09:36 +02:00
Luca Haid
5163fa6142 Merge branch 'tt-table/fix-multi-icon-select' into 'master'
fixed multi icon select

See merge request fronk/thetool!1279
2025-04-29 11:12:14 +00:00
Luca Haid
21f65aa905 fixed multi icon select 2025-04-29 13:12:04 +02:00
Luca Haid
86f0655235 Merge branch 'tt-table/fix-multi-icon-select' into 'master'
fixed multi icon select

See merge request fronk/thetool!1278
2025-04-29 11:10:36 +00:00
Luca Haid
a212ec1a3f fixed multi icon select 2025-04-29 13:10:26 +02:00
Luca Haid
e99cdcf3b6 Merge branch 'WarehouseHistory/fix-history-controller' into 'master'
fixed new model classes without model

See merge request fronk/thetool!1277
2025-04-29 11:03:03 +00:00
Luca Haid
a115910032 fixed new model classes without model 2025-04-29 13:02:51 +02:00
Luca Haid
1288155a87 Merge branch 'WarehouseHistory/fix-history-controller' into 'master'
fixed new model classes without model

See merge request fronk/thetool!1276
2025-04-29 10:55:09 +00:00
Luca Haid
fc9d52ba18 fixed new model classes without model 2025-04-29 12:54:52 +02:00
Luca Haid
a12c05dae4 Merge branch 'WarehouseHistory/fix-history-controller' into 'master'
fixed new model classes without model

See merge request fronk/thetool!1275
2025-04-29 10:53:36 +00:00
Luca Haid
db50fd8a72 fixed new model classes without model 2025-04-29 12:53:21 +02:00
Frank Schubert
c8e4155ad2 Merge branch 'fronkdev' into 'master'
Added is_discount property to api docs

See merge request fronk/thetool!1274
2025-04-28 14:00:05 +00:00
Frank Schubert
2fb60aab2d Added is_discount property to api docs 2025-04-28 15:59:20 +02:00
Frank Schubert
e19d61ec1f Merge branch 'fronkdev' into 'master'
added is_dicount property to AddressdbApi Pricing

See merge request fronk/thetool!1273
2025-04-28 13:52:26 +00:00
Frank Schubert
5d16c93d18 added is_dicount property to AddressdbApi Pricing 2025-04-28 15:51:54 +02:00
Luca Haid
8ecb6edbaf Merge branch 'WarehouseOffer/new-features' into 'master'
added pdf creation

See merge request fronk/thetool!1272
2025-04-28 12:42:10 +00:00
Luca Haid
948fe74254 added pdf creation 2025-04-28 14:41:55 +02:00
Luca Haid
c0c236b7a9 Merge branch 'Address/add-shipping-note-view' into 'master'
added new way to select areas for shipping note

See merge request fronk/thetool!1271
2025-04-28 11:42:20 +00:00
Luca Haid
3390deb336 added new way to select areas for shipping note 2025-04-28 13:42:10 +02:00
Luca Haid
16f7ba232b Merge branch 'Address/add-shipping-note-view' into 'master'
added new way to select areas for shipping note

See merge request fronk/thetool!1270
2025-04-28 11:39:23 +00:00
Luca Haid
fee73ab5f2 added new way to select areas for shipping note 2025-04-28 13:37:58 +02:00
Luca Haid
f67fa96257 Merge branch 'Address/add-shipping-note-view' into 'master'
added lieferscheine to ticket view in thetool

See merge request fronk/thetool!1269
2025-04-25 11:16:39 +00:00
Luca Haid
a076cf6b9c added lieferscheine to ticket view in thetool 2025-04-25 13:16:24 +02:00
Luca Haid
98e5ee479b Merge branch 'WarehouseCategory/implement-delete-safe-check' into 'master'
implement delete safe check

See merge request fronk/thetool!1268
2025-04-25 11:11:54 +00:00
Luca Haid
b45ffdc8cd implement delete safe check 2025-04-25 13:11:44 +02:00
Frank Schubert
45efb5d2fd Merge branch 'fronkdev' into 'master'
PreorderBilling: changed price column to german format as string

See merge request fronk/thetool!1267
2025-04-25 10:54:29 +00:00
Frank Schubert
a4ce5a1768 PreorderBilling: changed price column to german format as string 2025-04-25 12:53:57 +02:00
Frank Schubert
9caec758c0 Merge branch 'fronkdev' into 'master'
Fixed Umlauts in rml HTML Billing Emailtemplate

See merge request fronk/thetool!1266
2025-04-25 10:07:48 +00:00
Frank Schubert
6d53d844e3 Fixed Umlauts in rml HTML Billing Emailtemplate 2025-04-25 12:07:28 +02:00