2c0ee7e83e
added csv export for triotronik for e shop orders
2024-08-02 10:28:19 +02:00
e31c240f76
fixed searching for article packets
2024-07-31 13:31:47 +02:00
Luca Haid
27de993a57
Merge branch 'feature/add-warehouse-e-shop-order-items' into 'master'
...
Feature/add warehouse e shop order items
See merge request fronk/thetool!537
2024-07-31 10:26:10 +00:00
Luca Haid
e2288ba6cd
Feature/add warehouse e shop order items
2024-07-31 10:26:10 +00:00
Frank Schubert
e42ce449e3
Merge branch 'fronkdev' into 'master'
...
fixed not updating addresses in rimo import
See merge request fronk/thetool!536
2024-07-31 09:31:00 +00:00
Frank Schubert
dc0475b29e
Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev
2024-07-31 11:29:20 +02:00
Frank Schubert
ed0aa00298
fixed not updating addresses in rimo import
2024-07-31 11:28:14 +02:00
Frank Schubert
7152527c9c
Merge branch 'fronkdev' into 'master'
...
Added estmk prefix to upgrade order email
See merge request fronk/thetool!535
2024-07-30 19:16:23 +00:00
Frank Schubert
6ed0a059a6
Added estmk prefix to upgrade order email
2024-07-30 21:14:51 +02:00
Frank Schubert
d7cdfc57fa
Merge branch 'fronkdev' into 'master'
...
hiding upgrade button from estmk in Order/Index
See merge request fronk/thetool!534
2024-07-30 18:58:45 +00:00
Frank Schubert
d773ecd91d
hiding upgrade button from estmk in Order/Index
2024-07-30 20:58:08 +02:00
Frank Schubert
914c6402e8
Merge branch 'fronkdev' into 'master'
...
Added email when ordering upgrade order
See merge request fronk/thetool!533
2024-07-30 18:56:30 +00:00
Frank Schubert
55916249b6
Added email when ordering upgrade order
2024-07-30 20:55:59 +02:00
Luca Haid
215d23ddc2
Merge branch 'feature/improve-domain' into 'master'
...
Feature/improve domain
See merge request fronk/thetool!532
2024-07-30 18:34:54 +00:00
Luca Haid
aea3ba9fb4
Feature/improve domain
2024-07-30 18:34:53 +00:00
Frank Schubert
1262a8192d
Merge branch 'fronkdev' into 'master'
...
Added missing Order/Upgrade template
See merge request fronk/thetool!531
2024-07-30 18:04:14 +00:00
Frank Schubert
19b0b4a048
Added missing Order/Upgrade template
2024-07-30 20:02:57 +02:00
Frank Schubert
73e634fb77
Merge branch 'fronkdev' into 'master'
...
Partner productchange done
See merge request fronk/thetool!530
2024-07-30 18:02:07 +00:00
Frank Schubert
a0cd6847b7
Partner productchange done
2024-07-30 20:01:29 +02:00
Luca Haid
3bd2e7a7bc
Merge branch 'feature/improve-domain' into 'master'
...
Feature/improve domain
See merge request fronk/thetool!529
2024-07-30 17:52:05 +00:00
Luca Haid
d75f9fa26f
Feature/improve domain
2024-07-30 17:52:04 +00:00
Luca Haid
6aebba464f
Merge branch 'feature/tt-table-fix-excel-export' into 'master'
...
fixed excel export to only show filtered rows
See merge request fronk/thetool!528
2024-07-30 17:01:05 +00:00
d1a598a144
fixed excel export to only show filtered rows
2024-07-30 19:59:44 +02:00
Frank Schubert
f5e0d4fadb
Merge branch 'fronkdev' into 'master'
...
Added sla_id in Contract/Form
See merge request fronk/thetool!527
2024-07-30 14:37:42 +00:00
Frank Schubert
48f3866bc7
Added sla_id in Contract/Form
2024-07-30 16:36:31 +02:00
Frank Schubert
1a437d50c4
Merge branch 'fronkdev' into 'master'
...
added onetime payment in Order/Form
See merge request fronk/thetool!526
2024-07-30 13:44:38 +00:00
Frank Schubert
b66c85bd06
added onetime payment in Order/Form
2024-07-30 15:43:52 +02:00
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
