Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity
1,243 Commits 7 Branches 0 Tags
3fab22873d08fc26b0ecf72956d8bc117f697d91
Commit Graph

1243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank Schubert
3fab22873d Merge branch 'spidev' into 'master' 
User Model Anpassungen

See merge request fronk/thetool!193
 2024-01-23 16:33:51 +00:00
Spitzer Daniel
e4c8189b61 User Model Anpassungen 2024-01-23 17:14:32 +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
Spitzer Daniel
63c6315295 Zeiterfassung Anpassungen 2024-01-23 16:54:35 +01:00
Spitzer Daniel
5f26e8ec26 Zeiterfassung Anpassungen 2024-01-23 16:34:14 +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
Spitzer Daniel
5d01cbe6d1 Zeiterfassung Feiertage Anpassungen 
Feldgrößen / Datum wird nun mit Wochentag angezeigt
 2024-01-14 14:08:39 +01:00
Spitzer Daniel
96baeddd17 Config Anpassung 
define("MFAPPFILE_VERSION", "v=1.12"); //used for css und js updates
Performance Steigerung
 2024-01-14 13:48:16 +01:00
Spitzer Daniel
c779a533b2 Zeiterfassung Urlaubstage 
neue Migrations

Vorbereitung für Logging von versendeten SMSen und Mails zweck rate Limit
 2024-01-14 13:16:54 +01:00
Spitzer Daniel
a4aaea2fb0 Stripe Rows der Datatables an Bootstrap angelehnt für Einheitlichkeit 2024-01-12 12:13:27 +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