Commit Graph

  • cbf96700b4 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-08-01 13:08:21 +00:00
  • fc8515ab6d Fixed last item in Contractqueue Frank Schubert 2024-08-01 15:07:30 +02:00
  • 72d386fd46 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-08-01 12:37:03 +00:00
  • 059d0968f3 fixed email logic in Order/Save Frank Schubert 2024-08-01 14:34:33 +02:00
  • b5cad11456 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-08-01 11:55:45 +00:00
  • dd6f8c0dc2 upgrade exception now for ewerk goesting too Frank Schubert 2024-08-01 13:54:44 +02:00
  • b776505bef Merge branch 'fronkdev' into 'master' Frank Schubert 2024-08-01 11:49:30 +00:00
  • 7085b1b7b3 Fixed saving zero price for onetime billing products in Order/Form Frank Schubert 2024-08-01 13:47:22 +02:00
  • 1bf211abb2 reformatted application/Preorder/Preorder.php Frank Schubert 2024-08-01 13:08:28 +02:00
  • c9a104dade Merge branch 'spidev' into 'master' Daniel Spitzer 2024-07-31 12:10:59 +00:00
  • d043c863bd Zeiterfassung Feature * Urlaubsübergabe ins BMD wird nun beim Monatsabschluss richtig berücksichtigt Daniel Spitzer 2024-07-31 14:09:35 +02:00
  • e40ee16fce Merge branch 'bugfix/warehouse-e-shop-order-articlepackets' into 'master' Luca Haid 2024-07-31 10:32:04 +00:00
  • e31c240f76 fixed searching for article packets Luca Haid 2024-07-31 13:31:47 +02:00
  • 27de993a57 Merge branch 'feature/add-warehouse-e-shop-order-items' into 'master' Luca Haid 2024-07-31 10:26:10 +00:00
  • e2288ba6cd Feature/add warehouse e shop order items Luca Haid 2024-07-31 10:26:10 +00:00
  • e42ce449e3 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-31 09:31:00 +00:00
  • dc0475b29e Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev Frank Schubert 2024-07-31 11:29:20 +02:00
  • ed0aa00298 fixed not updating addresses in rimo import Frank Schubert 2024-07-31 11:28:14 +02:00
  • 7152527c9c Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-30 19:16:23 +00:00
  • 6ed0a059a6 Added estmk prefix to upgrade order email Frank Schubert 2024-07-30 21:14:51 +02:00
  • d7cdfc57fa Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-30 18:58:45 +00:00
  • d773ecd91d hiding upgrade button from estmk in Order/Index Frank Schubert 2024-07-30 20:58:08 +02:00
  • 914c6402e8 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-30 18:56:30 +00:00
  • 55916249b6 Added email when ordering upgrade order Frank Schubert 2024-07-30 20:55:59 +02:00
  • 215d23ddc2 Merge branch 'feature/improve-domain' into 'master' Luca Haid 2024-07-30 18:34:54 +00:00
  • aea3ba9fb4 Feature/improve domain Luca Haid 2024-07-30 18:34:53 +00:00
  • 1262a8192d Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-30 18:04:14 +00:00
  • 19b0b4a048 Added missing Order/Upgrade template Frank Schubert 2024-07-30 20:02:57 +02:00
  • 73e634fb77 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-30 18:02:07 +00:00
  • a0cd6847b7 Partner productchange done Frank Schubert 2024-07-30 20:01:29 +02:00
  • 3bd2e7a7bc Merge branch 'feature/improve-domain' into 'master' Luca Haid 2024-07-30 17:52:05 +00:00
  • d75f9fa26f Feature/improve domain Luca Haid 2024-07-30 17:52:04 +00:00
  • 6aebba464f Merge branch 'feature/tt-table-fix-excel-export' into 'master' Luca Haid 2024-07-30 17:01:05 +00:00
  • d1a598a144 fixed excel export to only show filtered rows Luca Haid 2024-07-30 19:59:44 +02:00
  • f5e0d4fadb Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-30 14:37:42 +00:00
  • 48f3866bc7 Added sla_id in Contract/Form Frank Schubert 2024-07-30 16:36:31 +02:00
  • 1a437d50c4 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-30 13:44:38 +00:00
  • b66c85bd06 added onetime payment in Order/Form Frank Schubert 2024-07-30 15:43:52 +02:00
  • be0672d8a2 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-29 15:13:00 +00:00
  • 75277d3f82 Rimo Status also update sets status when input params higher then specified Frank Schubert 2024-07-29 17:11:35 +02:00
  • 0dce17ac25 Added PreorderStatusflags to PreorderHistory Frank Schubert 2024-07-29 16:13:04 +02:00
  • 6303eb57fc Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-29 12:45:04 +00:00
  • 4abaa50f56 Added PreorderStatusflag to Preorder/Index Frank Schubert 2024-07-29 14:44:08 +02:00
  • 5d1d45a75e Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-26 11:41:30 +00:00
  • 44483cdaca removing rimo_id if found on another address in vis update Frank Schubert 2024-07-26 13:40:55 +02:00
  • 599fe049a3 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-26 11:30:15 +00:00
  • 40fc9da9af Addedd CSV update for AddressDB Visibility and rimo id Frank Schubert 2024-07-26 13:29:33 +02:00
  • 5627ab9869 Merge branch 'spidev' into 'master' Daniel Spitzer 2024-07-26 06:35:37 +00:00
  • fe63151fa2 Zeiterfassung Feature/Bugfix * Abwesenheitskalender kann nun maximiert werden * Abwesenheitskalender verschieben ist nun blockiert. * Fahrzugverwaltung Übersicht fixed header Hintergrund angepasst Daniel Spitzer 2024-07-26 08:33:39 +02:00
  • 0ac07be464 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-25 20:33:12 +00:00
  • 1cff6f20bb changed billing_period text in Product/Index Frank Schubert 2024-07-25 22:32:37 +02:00
  • b99ac8567f Added onetime billing option in Productform Frank Schubert 2024-07-25 22:30:18 +02:00
  • 07ff8dacd9 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-25 20:19:58 +00:00
  • a72010234a Fixed creating new Contracts Frank Schubert 2024-07-25 22:19:32 +02:00
  • 31eb4c7b6c Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-25 19:54:09 +00:00
  • 501b0ce4d8 small change in productchange ticket Frank Schubert 2024-07-25 21:53:13 +02:00
  • 15ca9b70d6 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-25 19:36:27 +00:00
  • 18f5f78a8f Added productchange notification ticket email Frank Schubert 2024-07-25 21:35:53 +02:00
  • 30d4b1cb58 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-25 18:32:31 +00:00
  • 3a6c03414b WIP Productchange Frank Schubert 2024-07-25 20:31:48 +02:00
  • 3155af0b5b Merge branch 'master' into fronkdev Frank Schubert 2024-07-25 17:22:45 +02:00
  • fe1677d7c6 WIP partner productchange Frank Schubert 2024-07-25 17:22:10 +02:00
  • 967c79da4a Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-25 13:57:39 +00:00
  • a0f66aaf3c Added view-switcher and center button controls inside map Frank Schubert 2024-07-25 15:56:53 +02:00
  • 21f6aea3a6 Merge branch 'fronkdev' into 'master' Frank Schubert 2024-07-25 12:27:53 +00:00
  • fdecf142e1 Temp disabled upgrade button in Order/Index Frank Schubert 2024-07-25 14:27:20 +02:00
  • 210ba2e771 Added fullscreen mode to maps Frank Schubert 2024-07-25 14:25:29 +02:00
  • d18ecb8880 Merge branch 'master' into fronkdev Frank Schubert 2024-07-25 13:50:02 +02:00
  • 5fa2000bd4 Merge branch 'preorderstatus-neu' into 'master' Frank Schubert 2024-07-25 10:53:33 +00:00
  • a3ca1db6c2 Fixed status history in preorder-detail Frank Schubert 2024-07-25 12:52:53 +02:00
  • 34e5f0a220 Merge branch 'feature/ipnetwork-update' into 'master' Luca Haid 2024-07-25 09:42:25 +00:00
  • 3c82c1e1b0 added delete and update functions to ipnetwork Luca Haid 2024-07-25 12:42:09 +02:00
  • 5ff9549461 Merge branch 'bugfix/warehouse-price-handling' into 'master' Luca Haid 2024-07-25 06:22:10 +00:00
  • 500486ba38 fixed mysql query for history Luca Haid 2024-07-25 09:21:54 +02:00
  • c1aefa32fd Merge branch 'bugfix/warehouse-price-handling' into 'master' Luca Haid 2024-07-25 06:01:26 +00:00
  • e4427c9eac fixed some price handling aswell as tt-autocomplete and tt-table excel export always showing Luca Haid 2024-07-25 08:59:41 +02:00
  • d9581f4d94 Merge branch 'preorderstatus-neu' into 'master' Frank Schubert 2024-07-24 18:39:28 +00:00
  • 6084370efc New Preorderstatus handling at import Frank Schubert 2024-07-24 20:38:15 +02:00
  • 813b0b4524 Merge branch 'bugfix/fix-php7-issue' into 'master' Luca Haid 2024-07-24 15:11:44 +00:00
  • ec187d56f8 Bugfix/fix php7 issue Luca Haid 2024-07-24 15:11:43 +00:00
  • f73aaffea9 Merge branch 'bugfix/fix-php7-issue' into 'master' Luca Haid 2024-07-24 15:07:47 +00:00
  • 29c873f145 Bugfix/fix php7 issue Luca Haid 2024-07-24 15:07:46 +00:00
  • 41f8a1b2e6 Merge branch 'feature/tt-table-move-filter-reset' into 'master' Luca Haid 2024-07-24 15:04:04 +00:00
  • cceb0c3f54 Feature/tt table move filter reset Luca Haid 2024-07-24 15:04:03 +00:00
  • 75e8c6b2e7 Merge branch 'feature/warehouse-improvements' into 'master' Luca Haid 2024-07-24 14:16:54 +00:00
  • c3f949e1ac Feature/warehouse improvements Luca Haid 2024-07-24 14:16:54 +00:00
  • 9aafa93bc9 Merge branch 'feature/add-e-shop' into 'master' Luca Haid 2024-07-24 13:25:50 +00:00
  • 6c79a9302f Feature/add e shop Luca Haid 2024-07-24 13:25:49 +00:00
  • 6bca4269da Merge branch 'master' into preorderstatus-neu Frank Schubert 2024-07-24 13:37:19 +02:00
  • b8c3783405 Merge branch 'master' into fronkdev Frank Schubert 2024-07-24 13:37:01 +02:00
  • a4f6b3b98c Partner Producthchange WIP 2024-07-23 Frank Schubert 2024-07-24 13:34:39 +02:00
  • 1c8f1acf2a Merge branch 'feature/tt-table-header-class' into 'master' Luca Haid 2024-07-23 14:19:55 +00:00
  • cd716a2e30 Feature/tt table header class Luca Haid 2024-07-23 14:19:54 +00:00
  • 1a7f18e3a3 Merge branch 'feature/tt-table-header-class' into 'master' Luca Haid 2024-07-23 14:15:53 +00:00
  • f090cea9a8 added headerClass property to tt-table Luca Haid 2024-07-23 17:15:13 +02:00
  • ce671f2edd Merge branch 'master' into fronkdev Frank Schubert 2024-07-23 15:52:06 +02:00
  • 56be9eea81 Started Order productchange Frank Schubert 2024-07-23 15:51:39 +02:00
  • 44848b06c7 Merge branch 'feature/add-disable-filtering' into 'master' Luca Haid 2024-07-23 13:50:46 +00:00
  • 4456c3e8fb added disable-filtering option Luca Haid 2024-07-23 16:50:25 +02:00
  • d8b3002cfa WIP 2024-07-22 Frank Schubert 2024-07-23 13:03:45 +02:00