Commit Graph

1125 Commits

Author SHA1 Message Date
Andreas Palm
4c5041b949 Fix merge error 2024-09-25 12:18:59 +02:00
Andreas Palm
2baab98261 Docker setup 2024-09-13 22:54:26 +02:00
Andreas Palm
83f8f61174 vite build 2024-09-11 23:12:12 +02:00
Andreas Palm
0d375668f8 Update packages, improve vite integration 2024-09-11 23:10:39 +02:00
Andreas Palm
7fca100a3d Remove old unused JS-Files 2024-09-11 22:51:03 +02:00
OpenXE
aac159bcb0 Merge branch 'onlineshops' 2024-09-11 10:01:47 +02:00
OpenXE-ERP
0df7600eb4
Merge pull request #154 from exciler/onlineshops
Re-add previous fix
2024-09-11 09:56:45 +02:00
OpenXE
616e3e8ee7 Bugfix add lieferadresse 2024-09-11 09:54:43 +02:00
Andreas Palm
f725281d7e Re-add previous fix 2024-09-10 23:09:39 +02:00
OpenXE
e40e543a7d bugfix remotesendlistlager result 2024-09-06 20:12:37 +02:00
OpenXE
014481d455 Merge branch 'master' into onlineshops 2024-09-04 16:14:41 +02:00
OpenXE
b7cf1dd04a exportbuchhaltung filter for pdfs 2024-09-04 16:01:12 +02:00
OpenXE
e81e404763 bugfix exportbuchhaltung abgeschlossen 2024-09-04 14:12:04 +02:00
OpenXE
e51e1db15c bugfix GetNextArtikelNummer skip existing numbers 2024-09-04 11:13:38 +02:00
OpenXE
1ff2878d06 exportbuchhaltung PDFs 2024-09-03 19:13:17 +02:00
OpenXE
b8d412ba93 Merge branch 'master' into onlineshops 2024-09-02 21:02:42 +02:00
OpenXE
04de0df0b6 lieferantengutschrift drucken 2024-09-02 21:00:16 +02:00
OpenXE
00da78e863 verbindlichkeit drucken 2024-09-02 20:33:50 +02:00
OpenXE
6afedcd423 Merge onlineshops development into onlineshops 2024-08-31 13:17:22 +02:00
OpenXE
1cc50d5cd7 class.remote.php improvements 2024-08-31 13:13:08 +02:00
OpenXE
8c3442c73d class.remote.php formatting 2024-08-31 13:12:37 +02:00
OpenXE
389a29793a mirakl auftrag import additional info 2024-08-29 18:43:26 +02:00
OpenXE
9fbc4e2f6b mirakl configuration_order_fetch_status 2024-08-29 18:09:04 +02:00
OpenXE
87739fccc5 Reordered navigation 2024-08-29 14:59:49 +02:00
OpenXE
c31b1a2b0d Version 1.12 2024-08-29 14:19:19 +02:00
OpenXE
39f9440990 Merge branch 'ps' 2024-08-29 14:17:25 +02:00
OpenXE
586e1bd9b9 bugfix exciler PR 2024-08-29 12:24:09 +02:00
OpenXE-ERP
ec68922e7a
Merge pull request #152 from exciler/bugfix_shopimport
FIX Shopimport: Update shop orders without shipments
2024-08-28 16:02:42 +02:00
OpenXE-ERP
d176ff757c
Merge pull request #151 from exciler/bugfix_articlethumbnail
Bugfix articlethumbnail
2024-08-28 16:02:30 +02:00
Andreas Palm
543c52f2f1 FIX Article: Use default picture selection in briefpapier 2024-08-27 15:44:20 +02:00
OpenXE-ERP
da8e007531
Merge pull request #150 from exciler/bugfix_shopimport
Shopimport: Fix sql escaping
2024-08-27 12:13:06 +02:00
OpenXE
b6b08f74b6 Merge branch 'master' into mirakl 2024-08-27 12:04:46 +02:00
OpenXE
a9656114a2 Bugfix verbindlichkeit positionen 2024-08-27 11:59:03 +02:00
Andreas Palm
1775d0b47f FIX Article: Filter deleted files from default picture selection 2024-08-26 22:19:15 +02:00
Andreas Palm
b7ade7b4b2 FIX Article: Filter deleted files from thumbnail selection 2024-08-26 21:58:28 +02:00
OpenXE
43b2cb05c0 Bugfix verbindlichkeit datepicker & skonto, zahlbarbis 0 tage 2024-08-26 14:18:41 +02:00
OpenXE
26e6d773a9 Lagersync bugfix result array 2024-08-26 11:03:59 +02:00
Andreas Palm
7675f93034 FIX Shopimport: Update shop orders without shipments 2024-08-25 21:50:50 +02:00
OpenXE
4351fd7b9d Merge branch 'master' into mirakl 2024-08-25 20:16:38 +02:00
OpenXE
19ac3415e3 verbindlichkeit bugfix netto positions rounded 2024-08-25 20:15:43 +02:00
OpenXE
50d8646d70 verbindlichkeit date assistant 2024-08-25 14:33:11 +02:00
OpenXE
3eb4d6bc3a lagerzahlen removed 10 sec. wait 2024-08-22 12:45:59 +02:00
Andreas Palm
e1b9428ef5 Shopimport: Fix sql escaping 2024-08-14 09:48:51 +02:00
OpenXE
23b9fa781b Smarty shopimport, additional database entries for fresh install 2024-08-11 13:19:53 +02:00
OpenXE
7e2155f586 TOTP, additional database entries for fresh install 2024-08-11 13:10:35 +02:00
OpenXE
5ad57e2fc8 bugfix TOTP, additional database entries needed: login_password_check_otp (hook), TOTPCheckLogin (hook_register) 2024-08-11 12:52:06 +02:00
OpenXE
94f3fb0261 cronjobs/cleaner.php removed shopimport_amazon_fees 2024-08-03 14:28:05 +02:00
OpenXE
d180a1af54 module_creator echo $sql 2024-08-03 13:33:58 +02:00
OpenXE
fbe266c97c bugfix mirakl auftragsimport country code 2024-08-01 14:12:06 +02:00
OpenXE
4fe1440dd0 Merge branch 'master' into mirakl 2024-07-25 12:32:37 +02:00