Commit Graph

2021 Commits

Author SHA1 Message Date
Frank Schubert
be0672d8a2 Merge branch 'fronkdev' into 'master'
Rimo Status also update sets status when input params higher then

See merge request fronk/thetool!525
2024-07-29 15:13:00 +00:00
Frank Schubert
75277d3f82 Rimo Status also update sets status when input params higher then
specified
2024-07-29 17:11:35 +02:00
Frank Schubert
0dce17ac25 Added PreorderStatusflags to PreorderHistory 2024-07-29 16:13:04 +02:00
Frank Schubert
6303eb57fc Merge branch 'fronkdev' into 'master'
Added PreorderStatusflag to Preorder/Index

See merge request fronk/thetool!524
2024-07-29 12:45:04 +00:00
Frank Schubert
4abaa50f56 Added PreorderStatusflag to Preorder/Index 2024-07-29 14:44:08 +02:00
Frank Schubert
5d1d45a75e Merge branch 'fronkdev' into 'master'
removing rimo_id if found on another address in vis update

See merge request fronk/thetool!523
2024-07-26 11:41:30 +00:00
Frank Schubert
44483cdaca removing rimo_id if found on another address in vis update 2024-07-26 13:40:55 +02:00
Frank Schubert
599fe049a3 Merge branch 'fronkdev' into 'master'
Addedd CSV update for AddressDB Visibility and rimo id

See merge request fronk/thetool!522
2024-07-26 11:30:15 +00:00
Frank Schubert
40fc9da9af Addedd CSV update for AddressDB Visibility and rimo id 2024-07-26 13:29:33 +02:00
Daniel Spitzer
5627ab9869 Merge branch 'spidev' into 'master'
Zeiterfassung Feature/Bugfix

See merge request fronk/thetool!521
2024-07-26 06:35:37 +00:00
Daniel Spitzer
fe63151fa2 Zeiterfassung Feature/Bugfix
* Abwesenheitskalender kann nun maximiert werden
 * Abwesenheitskalender verschieben ist nun blockiert.
 * Fahrzugverwaltung Übersicht fixed header Hintergrund angepasst
2024-07-26 08:33:39 +02:00
Frank Schubert
0ac07be464 Merge branch 'fronkdev' into 'master'
Fronkdev

See merge request fronk/thetool!520
2024-07-25 20:33:12 +00:00
Frank Schubert
1cff6f20bb changed billing_period text in Product/Index 2024-07-25 22:32:37 +02:00
Frank Schubert
b99ac8567f Added onetime billing option in Productform 2024-07-25 22:30:18 +02:00
Frank Schubert
07ff8dacd9 Merge branch 'fronkdev' into 'master'
Fixed creating new Contracts

See merge request fronk/thetool!519
2024-07-25 20:19:58 +00:00
Frank Schubert
a72010234a Fixed creating new Contracts 2024-07-25 22:19:32 +02:00
Frank Schubert
31eb4c7b6c Merge branch 'fronkdev' into 'master'
small change in productchange ticket

See merge request fronk/thetool!518
2024-07-25 19:54:09 +00:00
Frank Schubert
501b0ce4d8 small change in productchange ticket 2024-07-25 21:53:13 +02:00
Frank Schubert
15ca9b70d6 Merge branch 'fronkdev' into 'master'
Added productchange notification ticket email

See merge request fronk/thetool!517
2024-07-25 19:36:27 +00:00
Frank Schubert
18f5f78a8f Added productchange notification ticket email 2024-07-25 21:35:53 +02:00
Frank Schubert
30d4b1cb58 Merge branch 'fronkdev' into 'master'
WIP Productchange

See merge request fronk/thetool!516
2024-07-25 18:32:31 +00:00
Frank Schubert
3a6c03414b WIP Productchange 2024-07-25 20:31:48 +02:00
Frank Schubert
3155af0b5b Merge branch 'master' into fronkdev 2024-07-25 17:22:45 +02:00
Frank Schubert
fe1677d7c6 WIP partner productchange 2024-07-25 17:22:10 +02:00
Frank Schubert
967c79da4a Merge branch 'fronkdev' into 'master'
Added view-switcher and center button controls inside map

See merge request fronk/thetool!515
2024-07-25 13:57:39 +00:00
Frank Schubert
a0f66aaf3c Added view-switcher and center button controls inside map 2024-07-25 15:56:53 +02:00
Frank Schubert
21f6aea3a6 Merge branch 'fronkdev' into 'master'
Added fullscreen mode to maps

See merge request fronk/thetool!514
2024-07-25 12:27:53 +00:00
Frank Schubert
fdecf142e1 Temp disabled upgrade button in Order/Index 2024-07-25 14:27:20 +02:00
Frank Schubert
210ba2e771 Added fullscreen mode to maps 2024-07-25 14:25:29 +02:00
Frank Schubert
d18ecb8880 Merge branch 'master' into fronkdev 2024-07-25 13:50:02 +02:00
Frank Schubert
5fa2000bd4 Merge branch 'preorderstatus-neu' into 'master'
Fixed status history in preorder-detail

See merge request fronk/thetool!513
2024-07-25 10:53:33 +00:00
Frank Schubert
a3ca1db6c2 Fixed status history in preorder-detail 2024-07-25 12:52:53 +02:00
Luca Haid
34e5f0a220 Merge branch 'feature/ipnetwork-update' into 'master'
added delete and update functions to ipnetwork

See merge request fronk/thetool!512
2024-07-25 09:42:25 +00:00
3c82c1e1b0 added delete and update functions to ipnetwork 2024-07-25 12:42:09 +02:00
500486ba38 fixed mysql query for history 2024-07-25 09:21:54 +02:00
e4427c9eac fixed some price handling aswell as tt-autocomplete and tt-table excel export always showing 2024-07-25 08:59:41 +02:00
Luca Haid
5ff9549461 Merge branch 'bugfix/warehouse-price-handling' into 'master'
fixed mysql query for history

See merge request fronk/thetool!511
2024-07-25 06:22:10 +00:00
Luca Haid
c1aefa32fd Merge branch 'bugfix/warehouse-price-handling' into 'master'
fixed some price handling aswell as tt-autocomplete and tt-table excel export always showing

See merge request fronk/thetool!510
2024-07-25 06:01:26 +00:00
Frank Schubert
d9581f4d94 Merge branch 'preorderstatus-neu' into 'master'
New Preorderstatus handling at import

See merge request fronk/thetool!509
2024-07-24 18:39:28 +00:00
Frank Schubert
6084370efc New Preorderstatus handling at import 2024-07-24 20:38:15 +02:00
Luca Haid
813b0b4524 Merge branch 'bugfix/fix-php7-issue' into 'master'
Bugfix/fix php7 issue

See merge request fronk/thetool!508
2024-07-24 15:11:44 +00:00
Luca Haid
ec187d56f8 Bugfix/fix php7 issue 2024-07-24 15:11:43 +00:00
Luca Haid
f73aaffea9 Merge branch 'bugfix/fix-php7-issue' into 'master'
Bugfix/fix php7 issue

See merge request fronk/thetool!507
2024-07-24 15:07:47 +00:00
Luca Haid
29c873f145 Bugfix/fix php7 issue 2024-07-24 15:07:46 +00:00
Luca Haid
41f8a1b2e6 Merge branch 'feature/tt-table-move-filter-reset' into 'master'
Feature/tt table move filter reset

See merge request fronk/thetool!506
2024-07-24 15:04:04 +00:00
Luca Haid
cceb0c3f54 Feature/tt table move filter reset 2024-07-24 15:04:03 +00:00
Luca Haid
75e8c6b2e7 Merge branch 'feature/warehouse-improvements' into 'master'
Feature/warehouse improvements

See merge request fronk/thetool!505
2024-07-24 14:16:54 +00:00
Luca Haid
c3f949e1ac Feature/warehouse improvements 2024-07-24 14:16:54 +00:00
Luca Haid
9aafa93bc9 Merge branch 'feature/add-e-shop' into 'master'
Feature/add e shop

See merge request fronk/thetool!503
2024-07-24 13:25:50 +00:00
Luca Haid
6c79a9302f Feature/add e shop 2024-07-24 13:25:49 +00:00