Commit Graph

2095 Commits

Author SHA1 Message Date
Frank Schubert
080dd7f7d0 Merge branch 'fronkdev' into 'master'
Added billingaddress compare script

See merge request fronk/thetool!562
2024-08-05 18:43:53 +00:00
Frank Schubert
5006b2fa88 Added billingaddress compare script 2024-08-05 20:43:33 +02:00
Frank Schubert
052bad3089 Merge branch 'fronkdev' into 'master'
Added billingaddress compare script

See merge request fronk/thetool!561
2024-08-05 18:42:51 +00:00
Frank Schubert
440ffbd8b9 Added billingaddress compare script 2024-08-05 20:42:21 +02:00
Frank Schubert
c5693a6f07 Merge branch 'fronkdev' into 'master'
fixed saving edit_by in Contract/save

See merge request fronk/thetool!560
2024-08-05 14:15:36 +00:00
Frank Schubert
b74dfced74 fixed saving edit_by in Contract/save 2024-08-05 16:15:08 +02:00
Frank Schubert
541cb3f160 Merge branch 'fronkdev' into 'master'
partner Credit Contracts get Provision Vatgroup

See merge request fronk/thetool!559
2024-08-05 14:03:26 +00:00
Frank Schubert
29b6ebc8e8 partner Credit Contracts get Provision Vatgroup 2024-08-05 16:02:46 +02:00
Frank Schubert
1dcbabf659 Merge branch 'fronkdev' into 'master'
fixed selecting vatgroup in Contract/Form

See merge request fronk/thetool!558
2024-08-05 13:57:31 +00:00
Frank Schubert
dcc86ad335 fixed selecting vatgroup in Contract/Form 2024-08-05 15:57:04 +02:00
Frank Schubert
ca18d03b85 Merge branch 'fronkdev' into 'master'
Fixed ignoring first 300 buildings in rimo import

See merge request fronk/thetool!557
2024-08-02 10:27:49 +00:00
Frank Schubert
349a73bd3a Fixed ignoring first 300 buildings in rimo import 2024-08-02 12:27:03 +02:00
Luca Haid
28a476eeda Merge branch 'bugfix/warehouse-e-shop-order-exoprt' into 'master'
switched csv export to excel export

See merge request fronk/thetool!556
2024-08-02 07:40:21 +00:00
27e4f6cd82 switched csv export to excel export 2024-08-02 10:40:15 +02:00
2c0ee7e83e added csv export for triotronik for e shop orders 2024-08-02 10:28:19 +02:00
Luca Haid
689dba697d Merge branch 'bugfix/warehouse-e-shop-order-articlepackets' into 'master'
added csv export for triotronik for e shop orders

See merge request fronk/thetool!555
2024-08-02 07:28:34 +00:00
Frank Schubert
6ea7fad4e1 Merge branch 'fronkdev' into 'master'
Not creating customer number if at least 1 product is external

See merge request fronk/thetool!554
2024-08-01 19:51:55 +00:00
Frank Schubert
35a1164da7 Not creating customer number if at least 1 product is external 2024-08-01 21:51:21 +02:00
Frank Schubert
990a10aa98 Merge branch 'fronkdev' into 'master'
Added cancel_date filter in Contract/Index

See merge request fronk/thetool!553
2024-08-01 19:26:28 +00:00
Frank Schubert
ef3af99ae4 Added cancel_date filter in Contract/Index 2024-08-01 21:26:03 +02:00
Frank Schubert
8d0605987d Merge branch 'fronkdev' into 'master'
Fixed not showing linked credits in Contract/Cancelform

See merge request fronk/thetool!552
2024-08-01 19:15:29 +00:00
Frank Schubert
3bec7832f5 Fixed not showing linked credits in Contract/Cancelform 2024-08-01 21:15:03 +02:00
Frank Schubert
dba2d56dd8 Merge branch 'fronkdev' into 'master'
fixed contract form

See merge request fronk/thetool!551
2024-08-01 18:56:52 +00:00
Frank Schubert
ab5d5a2ced fixed contract form 2024-08-01 20:56:32 +02:00
Frank Schubert
5f488c9884 Merge branch 'fronkdev' into 'master'
Added Contractqueue to menu

See merge request fronk/thetool!550
2024-08-01 18:51:49 +00:00
Frank Schubert
1d935a0e01 Added Contractqueue to menu 2024-08-01 20:51:21 +02:00
Frank Schubert
c466b7585c Merge branch 'fronkdev' into 'master'
Changed to contractqueue and contract

See merge request fronk/thetool!549
2024-08-01 18:46:12 +00:00
Frank Schubert
840c5b6f2a Changed to contractqueue and contract 2024-08-01 20:45:44 +02:00
Frank Schubert
a9063ff1d1 Merge branch 'fronkdev' into 'master'
changed filter in Contractqueue Import

See merge request fronk/thetool!548
2024-08-01 17:22:52 +00:00
Frank Schubert
489d081d35 changed filter in Contractqueue Import 2024-08-01 19:22:27 +02:00
Frank Schubert
35fee3924d Merge branch 'fronkdev' into 'master'
Contractqueue changes

See merge request fronk/thetool!547
2024-08-01 17:16:07 +00:00
Frank Schubert
7f3075dae6 Contractqueue changes 2024-08-01 19:15:44 +02:00
Frank Schubert
f21068918b Merge branch 'fronkdev' into 'master'
always showing finish_date in Order/Form

See merge request fronk/thetool!546
2024-08-01 16:15:00 +00:00
Frank Schubert
ffa5497759 always showing finish_date in Order/Form 2024-08-01 18:13:05 +02:00
Frank Schubert
e64d048796 Merge branch 'fronkdev' into 'master'
Fixed buttons submitting form in Contractqueue/Index

See merge request fronk/thetool!545
2024-08-01 13:18:46 +00:00
Frank Schubert
a4a1bf2b83 Fixed buttons submitting form in Contractqueue/Index 2024-08-01 15:14:05 +02:00
Frank Schubert
cbf96700b4 Merge branch 'fronkdev' into 'master'
Fixed last item in Contractqueue

See merge request fronk/thetool!544
2024-08-01 13:08:21 +00:00
Frank Schubert
fc8515ab6d Fixed last item in Contractqueue 2024-08-01 15:07:30 +02:00
Frank Schubert
72d386fd46 Merge branch 'fronkdev' into 'master'
fixed email logic in Order/Save

See merge request fronk/thetool!543
2024-08-01 12:37:03 +00:00
Frank Schubert
059d0968f3 fixed email logic in Order/Save 2024-08-01 14:34:33 +02:00
Frank Schubert
b5cad11456 Merge branch 'fronkdev' into 'master'
upgrade exception now for ewerk goesting too

See merge request fronk/thetool!542
2024-08-01 11:55:45 +00:00
Frank Schubert
dd6f8c0dc2 upgrade exception now for ewerk goesting too 2024-08-01 13:54:44 +02:00
Frank Schubert
b776505bef Merge branch 'fronkdev' into 'master'
Fixed saving zero price for onetime billing products in Order/Form

See merge request fronk/thetool!541
2024-08-01 11:49:30 +00:00
Frank Schubert
7085b1b7b3 Fixed saving zero price for onetime billing products in Order/Form 2024-08-01 13:47:22 +02:00
Frank Schubert
1bf211abb2 reformatted application/Preorder/Preorder.php 2024-08-01 13:08:28 +02:00
Daniel Spitzer
c9a104dade Merge branch 'spidev' into 'master'
Zeiterfassung Fix

See merge request fronk/thetool!540
2024-07-31 12:10:59 +00:00
Daniel Spitzer
d043c863bd Zeiterfassung Feature
* Urlaubsübergabe ins BMD wird nun beim Monatsabschluss richtig berücksichtigt
2024-07-31 14:09:35 +02:00
e31c240f76 fixed searching for article packets 2024-07-31 13:31:47 +02:00
Luca Haid
e40ee16fce Merge branch 'bugfix/warehouse-e-shop-order-articlepackets' into 'master'
fixed searching for article packets

See merge request fronk/thetool!539
2024-07-31 10:32:04 +00: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