Commit Graph
100 Commits
Author SHA1 Message Date
Frank Schubert 17e2f87c20 Fixed not saving baufreigabe when no permission 2024-01-30 18:17:10 +01:00
Frank Schubert 9feb1c5fdf Added Productattrib type salespartner 2024-01-30 15:18:30 +01:00
Frank Schubert 9b694ed1e9 WIP 2023-01-29 2024-01-30 11:34:50 +01:00
Frank Schubert de66c189e7 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-01-29 11:42:24 +01:00
Frank Schubert 55c1edae3a Added Port(Service) and Workorder import to rimo importer 2024-01-29 11:33:57 +01:00
Frank Schubert 1d553772b6 Updated rimo import script / preorder maint scripts 2024-01-26 14:21:23 +01:00
Frank Schubert 2b224b55c0 Prepared BMD export for cronjob use 2024-01-24 18:12:07 +01:00
Frank Schubert 1ddbaa7fc8 Added Preorder count in unit table in AddressDB/View 2024-01-24 14:27:02 +01:00
Frank Schubert 808c846d88 Updated OpenAccessId::exportToRimoAndAssignFtu() 2024-01-24 13:36:36 +01:00
Frank Schubert ec9ccf1830 WIP OAID Rimo management 2024-01-24 10:49:53 +01:00
Frank Schubert d2dd48ba52 dashboard update 2024-01-23 22:51:48 +01:00
Frank Schubert b342edb99e Fixed reset filter button in Addres/Index 2024-01-23 21:15:40 +01:00
Frank Schubert 76def95fd9 updated Address filter 2024-01-23 21:12:46 +01:00
Frank Schubert 2c5e4b1f5c Fixed initial state of employee number visibility 2024-01-23 17:12:32 +01:00
Frank Schubert a0301f1051 Merge branch 'master' into fronkdev 2024-01-23 17:10:50 +01:00
Frank Schubert 27b8716974 WIP Address & rimo import 2024-01-23 17:07:39 +01:00
Frank Schubert 124b5ca9f3 Merge branch 'master' into 'spidev'
# Conflicts:
#   Layout/default/header.php
2024-01-23 16:07:04 +00:00
Frank Schubert 5734df38f5 Merge branch 'fronkdev' into 'master'
changed timestamp to git_merge_ts in header.php

See merge request fronk/thetool!192
2024-01-23 16:05:02 +00:00
Frank Schubert 6e7d158287 changed timestamp to git_merge_ts in header.php 2024-01-23 17:04:31 +01:00
Frank Schubert c235ddbe69 Merge branch 'fronkdev' into 'master'
Added git post hook handler

See merge request fronk/thetool!191
2024-01-23 16:00:45 +00:00
Frank Schubert 76083e5d53 Added git post hook handler 2024-01-23 17:00:20 +01:00
Frank Schubert 03e080e4c5 Merge branch 'fronkdev' into 'master'
Added fibu_supplier_paymentblock to Address

See merge request fronk/thetool!189
2024-01-23 14:13:19 +00:00
Frank Schubert f060cb50a2 Added fibu_supplier_paymentblock to Address 2024-01-23 15:12:31 +01:00
Frank Schubert 2c3b420be5 Merge branch 'fronkdev' into 'master'
Fixed not showing non-Object OAIDs in ADB view

See merge request fronk/thetool!188
2024-01-23 12:45:47 +00:00
Frank Schubert 5aa386c0f9 Fixed not showing non-Object OAIDs in ADB view 2024-01-23 13:45:10 +01:00
Frank Schubert fb608c035d Merge branch 'fronkdev' into 'master'
conditional oaid assignment on unit creation

See merge request fronk/thetool!187
2024-01-23 12:40:41 +00:00
Frank Schubert d6b5d5d7f0 conditional oaid assignment on unit creation 2024-01-23 13:39:14 +01:00
Frank Schubert 23e4c9f03b Merge branch 'fronkdev' into 'master'
check and update ftu when exporting oaid to rimo

See merge request fronk/thetool!186
2024-01-22 14:06:52 +00:00
Frank Schubert 9046180e7a check and update ftu when exporting oaid to rimo 2024-01-22 15:05:56 +01:00
Frank Schubert ff691e2e00 Merge branch 'fronkdev' into 'master'
Added adb unit count to OpenAccessId Index

See merge request fronk/thetool!185
2024-01-22 10:24:43 +00:00
Frank Schubert 5d051406fa Added adb unit count to OpenAccessId Index 2024-01-22 11:24:14 +01:00
Frank Schubert 259b7bf1a5 Merge branch 'fronkdev' into 'master'
Preorder statistics update

See merge request fronk/thetool!184
2024-01-22 09:27:27 +00:00
Frank Schubert 3ab04b7a20 Preorder statistics update 2024-01-22 10:26:48 +01:00
Frank Schubert 81559e295f Merge branch 'fronkdev' into 'master'
Finished Preorder statistics / added statistics permission

See merge request fronk/thetool!183
2024-01-20 08:19:08 +00:00
Frank Schubert a90de85ddf Finished Preorder statistics / added statistics permission 2024-01-20 09:17:26 +01:00
Frank Schubert 6dfaef642f Merge branch 'fronkdev' into 'master'
Not deleting OAID anymore when saving ADBWohneinheit

See merge request fronk/thetool!182
2024-01-18 21:06:37 +00:00
Frank Schubert 791465c9a4 Not deleting OAID anymore when saving ADBWohneinheit 2024-01-18 22:06:08 +01:00
Frank Schubert b358c95f11 Merge branch 'fronkdev' into 'master'
Added ADBWohneinheit edit, productgroup matchcodeorigin

See merge request fronk/thetool!181
2024-01-18 21:04:00 +00:00
Frank Schubert fc3c3de604 Added ADBWohneinheit edit, productgroup matchcodeorigin 2024-01-18 22:02:43 +01:00
Frank Schubert 395e879831 Merge branch 'fronkdev' into 'master'
Address::syncToFibuMerge() checks for old_custnum and name before

See merge request fronk/thetool!180
2024-01-18 20:12:23 +00:00
Frank Schubert e19442cd43 Address::syncToFibuMerge() checks for old_custnum and name before
updateing
2024-01-18 21:10:45 +01:00
Frank Schubert 2e9d45630d Merge branch 'fronkdev' into 'master'
Address::syncToFibuMerge() knows about > 900000 customer numbers now

See merge request fronk/thetool!179
2024-01-18 19:11:13 +00:00
Frank Schubert d2297ab0a9 Address::syncToFibuMerge() knows about > 900000 customer numbers now 2024-01-18 20:10:22 +01:00
Frank Schubert ba55aa49e3 Merge branch 'fronkdev' into 'master'
Fixed umlauts in translation function

See merge request fronk/thetool!178
2024-01-18 14:13:42 +00:00
Frank Schubert e9f52190e0 Fixed umlauts in translation function 2024-01-18 15:13:09 +01:00
Frank Schubert 97608ab5cf Merge branch 'fronkdev' into 'master'
XinonFibuMerge source update

See merge request fronk/thetool!177
2024-01-17 17:02:50 +00:00
Frank Schubert d6477a9452 Added source to SyncToFibumerge 2024-01-17 18:00:53 +01:00
Frank Schubert c5ee7faae1 Added trims to BMD Export 2024-01-17 17:57:17 +01:00
Frank Schubert f8dc96f84d Merge branch 'fronkdev' into 'master'
BMD export update / address Skonto

See merge request fronk/thetool!176
2024-01-16 18:23:21 +00:00
Frank Schubert e806dd6d11 BMD Export update 2024-01-16 19:22:33 +01:00
Frank Schubert 086706d6c7 BMD export update / address Skonto 2024-01-16 16:46:16 +01:00
Frank Schubert de393d648b Merge branch 'fronkdev' into 'master'
Update to Dashboard Preorder statistics

See merge request fronk/thetool!175
2024-01-15 17:25:23 +00:00
Frank Schubert 898e35f830 Update to Dashboard Preorder statistics 2024-01-15 18:16:20 +01:00
Frank Schubert bee9e2b5f5 Merge branch 'fronkdev' into 'master'
Dashboard: partner orders legend does not overflow anymore

See merge request fronk/thetool!174
2024-01-11 21:53:38 +00:00
Frank Schubert 686082a62d Dashboard: partner orders legend does not overflow anymore 2024-01-11 22:52:38 +01:00
Frank Schubert f17624e8ef Merge branch 'fronkdev' into 'master'
added sparkline to order count on dashboard

See merge request fronk/thetool!173
2024-01-11 21:48:06 +00:00
Frank Schubert bb93587135 added sparkline to order count on dashboard 2024-01-11 22:47:26 +01:00
Frank Schubert 64926de9c5 Merge branch 'fronkdev' into 'master'
Voiceplan import: fixprice zones are handled in zone copy too

See merge request fronk/thetool!172
2024-01-11 20:03:06 +00:00
Frank Schubert ea8fd727f6 Voiceplan import: fixprice zones are handled in zone copy too 2024-01-11 21:01:48 +01:00
Frank Schubert b7aca4bfaf Merge branch 'fronkdev' into 'master'
Fixed csv seperator in voiceplan import

See merge request fronk/thetool!171
2024-01-11 19:46:56 +00:00
Frank Schubert a6c5262861 Fixed csv seperator in voiceplan import 2024-01-11 20:46:27 +01:00
Frank Schubert 35fa256bf4 Merge branch 'fronkdev' into 'master'
Voiceplan import: fixed price destination zones sales price is now purchase

See merge request fronk/thetool!170
2024-01-11 19:41:35 +00:00
Frank Schubert c16df5077a Voiceplan import: fixed price destination zones sales price is now purchase
price
2024-01-11 20:39:35 +01:00
Frank Schubert 742cd59317 Merge branch 'fronkdev' into 'master'
Added partner order statistic on dashboard

See merge request fronk/thetool!169
2024-01-11 17:22:15 +00:00
Frank Schubert f86190d72c Added partner order statistic on dashboard 2024-01-11 18:21:02 +01:00
Frank Schubert 998bcc5f6d Merge branch 'fronkdev' into 'master'
fixed Pop list in Network/Index

See merge request fronk/thetool!168
2024-01-11 15:59:06 +00:00
Frank Schubert 42c527c38c fixed Pop list in Network/Index 2024-01-11 16:58:41 +01:00
Frank Schubert d13ed8ab8f Merge branch 'fronkdev' into 'master'
Kleine Designanpassung

See merge request fronk/thetool!167
2024-01-11 15:35:37 +00:00
Frank Schubert 82e10f5441 Kleine Designanpassung 2024-01-11 16:34:57 +01:00
Frank Schubert 50c3ccff10 Merge branch 'fronkdev' into 'master'
Fixed pops retrieval in Network

See merge request fronk/thetool!166
2024-01-11 14:16:01 +00:00
Frank Schubert d3287307ba Fixed pops retrieval in Network 2024-01-11 15:15:10 +01:00
Frank Schubert 3a796e4921 Merge branch 'fronkdev' into 'master'
Updates Liezen Bulk Update script 2024

See merge request fronk/thetool!165
2024-01-10 21:50:56 +00:00
Frank Schubert 1d6da057a0 Updates Liezen Bulk Update script 2024 2024-01-10 22:50:25 +01:00
Frank Schubert ce756cb8a1 Merge branch 'spidev' into 'master'
SMS Bereinigung/Responsive Anpassungen/Zeiterfassung

See merge request fronk/thetool!163
2024-01-10 20:57:43 +00:00
Frank Schubert 4d57759686 Merge branch 'fronkdev' into 'master'
Liezen Bulk Update 2024

See merge request fronk/thetool!164
2024-01-10 20:30:00 +00:00
Frank Schubert 3611372669 Only admins can see new Dashboard 2024-01-10 21:29:01 +01:00
Frank Schubert 1bc9e85cc6 Liezen Bulk Update done 2024-01-10 21:24:25 +01:00
Frank Schubert 1c516c4b70 WIP Dashboard & liezen bulk update 2024-01-10 18:36:45 +01:00
Frank Schubert 9f83e87985 Merge branch 'fronkdev' into 'master'
Fixed error in User/Form

See merge request fronk/thetool!162
2024-01-10 10:08:19 +00:00
Frank Schubert 5a88b4fe64 Fixed error in User/Form 2024-01-10 11:07:16 +01:00
Frank Schubert a81b9e9c94 Merge branch 'fronkdev' into 'master'
Added Iban&Bic Validation to Address/Form

See merge request fronk/thetool!161
2024-01-09 20:56:10 +00:00
Frank Schubert fdf57fbf4c Added Iban&Bic Validation to Address/Form 2024-01-09 21:55:35 +01:00
Frank Schubert 18493d556f Merge branch 'fronkdev' into 'master'
Added online bankdata validation

See merge request fronk/thetool!160
2024-01-09 19:50:19 +00:00
Frank Schubert a0ea0995e5 Added online bankdata validation 2024-01-09 20:49:33 +01:00
Frank Schubert b1a3c2384b Merge branch 'fronkdev' into 'master'
Changed customer_number to address_id in Address::exportBMD

See merge request fronk/thetool!159
2024-01-09 17:57:53 +00:00
Frank Schubert 161dd1b79d Changed customer_number to address_id in Address::exportBMD 2024-01-09 18:56:55 +01:00
Frank Schubert 8a0bf56eac Merge branch 'fronkdev' into 'master'
Only show Fibu fields in Address/Form if can Fibu

See merge request fronk/thetool!158
2024-01-09 17:33:14 +00:00
Frank Schubert eff08d5945 Only show Fibu fields in Address/Form if can Fibu 2024-01-09 18:32:30 +01:00
Frank Schubert 4dc78b009c Merge branch 'spidev' into 'master'
Bugfix UserProfile

See merge request fronk/thetool!157
2024-01-09 17:20:31 +00:00
Frank Schubert b8df4ef4a4 Merge branch 'fronkdev' into 'master'
Added User flag employee_number

See merge request fronk/thetool!156
2024-01-09 17:15:13 +00:00
Frank Schubert 3f05890a5f Added User falg employee_number 2024-01-09 18:14:09 +01:00
Frank Schubert 71b5db4940 Merge branch 'master' into fronkdev 2024-01-09 17:27:57 +01:00
Frank Schubert 724ffcff84 Changed pop_id in workflow for new PopNetwork table 2024-01-09 17:17:22 +01:00
Frank Schubert 3d353cdabe WIP Ivt Crediting import 2024-01-09 16:30:38 +01:00
Frank Schubert fba7c7f57b Merge branch 'spidev' into 'master'
Mobile Integration,Pop Multiple Networks,DataTables responsible update,Migrations

See merge request fronk/thetool!155
2024-01-09 15:30:03 +00:00
Frank Schubert 9390f12c45 Added new Rimo import script(s) 2024-01-08 21:29:32 +01:00
Frank Schubert 7f2d792cf7 Merge branch 'fronkdev' into 'master'
New customer_numbers now begin with 10 again

See merge request fronk/thetool!154
2024-01-07 15:26:45 +00:00
Frank Schubert 9ebad06205 New customer_numbers now begin with 10 again 2024-01-07 16:25:52 +01:00
Frank Schubert 1e5695e694 Merge branch 'fronkdev' into 'master'
Preorder API Update & Added adb_netzgebiet_id to Network/Form

See merge request fronk/thetool!153
2024-01-05 18:49:00 +00:00
Frank Schubert 97d3dae8ac Added adb_netzgebiet_id to Network/Form 2024-01-05 19:48:03 +01:00