Commit Graph

926 Commits

Author SHA1 Message Date
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
a3285d6c61 seriennummern added workflow buttons control, minidetail for seriennummer 2024-08-21 12:45:19 +02:00
OpenXE
42f5d3cc01 seriennummern lieferschein warning and tab 2024-08-15 18:12:58 +02:00
Andreas Palm
e1b9428ef5 Shopimport: Fix sql escaping 2024-08-14 09:48:51 +02:00
OpenXE
5f590c586c seriennummern seriennummern_check_serials ignore lieferschein with empty belegnr 2024-08-13 12:13:56 +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
934bd151ea seriennummern bugfix lieferschein check message 2024-08-07 12:11:32 +02:00
OpenXE
8f3d2a6ade seriennummern bugfix array PDF 2024-08-06 22:52:47 +02:00
OpenXE
ca6249584f seriennummern print on lieferschein preliminary 2024-08-06 22:13:37 +02:00
OpenXE
c486b241bd seriennummern lieferschein enter() 2024-08-06 15:21:23 +02:00
OpenXE
a907a9fa3f seriennummern zwischenstand 2024-08-04 22:05:35 +02:00
OpenXE
00d10dd7cc seriennummern removed dropnbox 2024-08-04 14:22:13 +02:00
OpenXE
39c78c52c1 seriennummern rework to new table structure lieferschein 2024-08-04 14:15:12 +02:00
OpenXE
ad37693818 seriennummern datum, eingelagert 2024-08-03 13:27:45 +02:00
OpenXE
fbe266c97c bugfix mirakl auftragsimport country code 2024-08-01 14:12:06 +02:00
OpenXE
2ebf0a91c6 bugfix seriennummern_nummern_list 2024-07-28 14:14:03 +02:00
OpenXE
5dbfe742b1 Merge branch 'master' into tmp2711221817 2024-07-28 13:45:03 +02:00
OpenXE
ee12d9097a seriennummern rework list view 2024-07-28 13:42:59 +02:00
OpenXE
a59e4a41e3 seriennummern notification after stock addition 2024-07-27 14:26:20 +02:00
OpenXE
a653e52784 seriennummern removed Xentral legacy 2024-07-26 14:51:45 +02:00
OpenXE
ea1d578ffa Seriennummern initial 2024-07-26 14:38:14 +02:00
OpenXE
4fe1440dd0 Merge branch 'master' into mirakl 2024-07-25 12:32:37 +02:00
OpenXE
d5120a9246 produktion ziellager placeholder_warning 2024-07-25 12:31:29 +02:00
OpenXE
4ea174e2b8 wareneingang show verbindlichkeit, added warning color class placeholder_warning 2024-07-25 11:48:47 +02:00
OpenXE
3301e1ed55 verbindlichkeit add position with price 10 decimal places 2024-07-25 10:46:54 +02:00
OpenXE
cd77b75df9 Merge branch 'master' into mirakl 2024-07-24 18:20:32 +02:00
OpenXE
663d5a4972 projekt eigene Nummernkreise 2024-07-24 18:14:29 +02:00
OpenXE
9a9e34a32a erpapi bugfix result of RemoteSendArticleList, new array format 2024-07-24 16:01:17 +02:00
OpenXE
58174a8eef mirakl volume pricing 2024-07-23 13:12:34 +02:00
OpenXE
1c8d64f3be revert faulty commit verbindlichkeit.php 2024-07-23 11:32:45 +02:00
OpenXE
f1400c4892 mirakl bugfix protokoll, taxes 2024-07-23 11:32:31 +02:00
OpenXE
22620698a1 Merge branch 'master' into mirakl 2024-07-23 11:27:45 +02:00
OpenXE
29cdae87ee Merge branch 'amperios' 2024-07-18 14:30:39 +02:00
Andreas Palm
2a9284c289 Bugfix: Shopexport Versandpakete distinct, prevent Null-Exception, Shopware Trackingcodes 2024-07-17 10:05:50 +02:00
OpenXE
5964974458 auftrag added filter not sent 2024-07-15 11:21:45 +02:00
OpenXE-ERP
697f10cc68
Merge pull request #146 from exciler/shopware6.6
Fix shopware importer for shopware 6.6
2024-07-14 10:01:41 +02:00
OpenXE
612483b5e7 Merge branch 'exciler_pr' 2024-07-14 09:56:20 +02:00
OpenXE
cbd44d167a rework paketmarke contact fields 2024-07-13 15:19:54 +02:00
OpenXE
78dff8b5c1 Buchhaltung export UTF-8, UTF-8-BOM 2024-07-11 17:16:22 +02:00
Andreas Palm
f5ac09944e Shopware 6: Export translations for variants 2024-07-10 12:23:08 +02:00
OpenXE
71337794ce Bugfix gruppen kennziffer 2024-07-08 20:01:59 +02:00
OpenXE
f8e8b30e78 Merge branch 'master' into ps 2024-07-08 19:32:39 +02:00
OpenXE
439edc93e9 bugfix angebot abweichendelieferadresse 2024-07-08 19:30:51 +02:00
OpenXE
9d3d5227f8 lieferbedingungen 2024-07-08 19:27:12 +02:00
Andreas Palm
cd2a163174 Fix shopware importer for shopware 6.6 2024-07-05 21:34:01 +02:00
OpenXE
7e44bbeccf bugfix artikeltexte 2024-07-02 13:20:21 +02:00
OpenXE
4ed783a7ca mirakl logging bugfix 2024-07-02 11:40:34 +02:00
OpenXE
4337a6503c class.remote.php send articles before stock (lagersync) 2024-07-02 10:33:35 +02:00
OpenXE
6e834b6df2 mirakl export products per configuration 2024-07-01 15:25:04 +02:00
OpenXE
01561960ec class.remote.php sendlist changed to work on arrays 2024-06-30 13:50:59 +02:00
OpenXE
d0d9c4150b mirakl logging improvements 2024-06-28 15:52:36 +02:00
OpenXE
eead996759 remote changed return values and behaviour WIP 2024-06-28 13:14:57 +02:00
OpenXE
48dbbd1a8b class.remote.php fixed formatting 2024-06-28 08:38:26 +02:00
OpenXE
8ebfc49ad2 artikeluebertragen WIP bulk transfer, switch to logger 2024-06-27 21:39:49 +02:00
OpenXE
7d18234567 cronjob artikeluebertragen format 2024-06-26 17:01:40 +02:00
OpenXE
e94894bad6 verbindlichkeit preis 10 decimal places 2024-06-25 11:36:40 +02:00
OpenXE
35add7d292 mirakl rework product export configuration 2024-06-24 14:45:19 +02:00
OpenXE
8e950b5185 artikel rework artikelexport returncode messages 2024-06-24 14:44:34 +02:00
OpenXE
ef8825faa8 importvorlage artikeleigenschaften 2024-06-23 12:45:26 +02:00
OpenXE
29f76aa9d9 mirakle configuration improvements 2024-06-21 18:11:48 +02:00
OpenXE
f1bd502044 laender 3-letter codes 2024-06-20 14:23:51 +02:00
OpenXE
610ed35218 shopimport improvements 2024-06-20 14:18:20 +02:00
OpenXE
04daacb227 mirakl importauftrag steuer, iso3 country code 2024-06-19 21:33:49 +02:00
OpenXE
4b7f3e19e7 erpapi ImportAuftrag abort with logfile if porto is not defined 2024-06-19 21:33:05 +02:00
OpenXE
15c36925a2 shopimport preview table 2024-06-19 21:31:40 +02:00
OpenXE
471bceb060 mirakl fetch orders 2024-06-18 15:19:19 +02:00
OpenXE
9b3950e3aa shopimport ajax submit vs. submit 2024-06-18 15:18:45 +02:00
OpenXE
4bbafdf5cb Onlineshops Smarty bugfix XML 2024-06-17 14:57:36 +02:00
OpenXE
bb4538498a mirakl reworked logging and functions 2024-06-17 13:09:30 +02:00
OpenXE
b06e0aa3e4 mirakl create product initial 2024-06-16 11:33:35 +02:00
OpenXE
2327ffdf81 Bugfix shopimport escaping 2024-06-14 13:20:19 +02:00
OpenXE
f95918647a reworked shop configuration fields and mapping 2024-06-13 15:51:30 +02:00
OpenXE
99b6a7c671 Merge branch 'master' into mirakl 2024-06-12 17:26:36 +02:00
OpenXE
09aacfbb7b Bugfix file upload dragndrop 2024-06-12 15:14:57 +02:00
OpenXE
2b43efca70 Bugfix add price when address is in several groups 2024-06-11 20:00:16 +02:00
OpenXE
0b5b7cbed1 Bugfixes adressstammdatenblatt 2024-06-11 19:45:39 +02:00
OpenXE
3c170318df gruppen module reimplemented 2024-06-10 17:43:16 +02:00
OpenXE
e3ffa8c1b8 Bugfix autoversand lieferscheinauslagern 2024-06-10 14:57:28 +02:00
OpenXE
575c15c333 adress search filter search in delivery adress 2024-06-08 10:03:14 +02:00
OpenXE
d01e37d15c Kommissionierung removed background 2024-06-07 18:28:57 +02:00
OpenXE
4f8e5958ef Paketmarke bugfix versandart send no email 2024-06-06 15:30:49 +02:00
OpenXE
bba2f6e56f bugfix auftrag versanduebergabe minidetail 2024-06-06 14:14:39 +02:00
OpenXE
1321cb9ece artikeltexte improvements and navigation 2024-06-05 18:44:24 +02:00
OpenXE
a7fae12200 bugfix versandpakete save comment, lose tracking 2024-06-05 15:00:40 +02:00
OpenXE
7bb519ea40 kommissionierung etikettautodruck 2024-06-05 14:38:34 +02:00
OpenXE
5774385cac adresse etikettautodruck mask 2024-06-05 12:36:35 +02:00
OpenXE
d7aa58190e kommissionierung rework functions 2024-06-05 11:00:55 +02:00
OpenXE
a5f5f4aede reimplemented module artikeltexte 2024-06-05 09:48:56 +02:00
OpenXE
ae4ceda258 bugfix shopimport $gesamtanzahl is string, should be int 2024-06-02 14:13:42 +02:00
OpenXE
35c5421b96 shopimport replaced ReadyForPDF with real_escape_string 2024-06-02 14:06:15 +02:00
OpenXE
102f25c3c6 erpapi parseuservars removed some pointless database selects 2024-06-02 13:59:07 +02:00
OpenXE
31b2d95ed1 Merge branch 'master' into mirakl 2024-06-01 18:11:12 +02:00
OpenXE
2058187866 Bugfix kommissionierung 2024-05-31 12:05:28 +02:00
OpenXE
d618edacc1 lager_platz kurzbezeichnung extended from 15 to 50 characters 2024-05-31 10:37:26 +02:00
OpenXE
2b50aa6f3a AARLGEditable insert with position # 2024-05-30 18:13:49 +02:00
OpenXE
c36f685d39 Bestellvorschlag allow manual 0 values to remove entry 2024-05-30 15:20:07 +02:00
OpenXE
dd2387a700 Kommissionierung Modul 2024-05-30 15:19:06 +02:00
OpenXE
652838c950 Kommissionierung, Kommissionsscheine 2024-05-30 14:44:54 +02:00
OpenXE
5c21bf6c1d Bugfix auftrag kommissionierung 2024-05-29 14:02:17 +02:00
OpenXE
7d41a4b73b Kommissionierung autoversand 2024-05-28 20:28:44 +02:00
OpenXE
57a9aa23ff class.remote sendlistlager condensed 2024-05-24 18:58:32 +02:00
OpenXE
d20bbe79b3 mirakl lagersync removed storageNotNeededElements 2024-05-24 18:57:37 +02:00
OpenXE
4f106028c9 mirakl send shop_id 2024-05-24 10:53:49 +02:00
OpenXE
7f61cad921 3540153c41 2024-05-24 10:18:26 +02:00
OpenXE
e71da793a3 mirakl angebotskonfiguration multiple categories 2024-05-24 10:10:59 +02:00
OpenXE
35e2feee2e mirakl field mapping for multiple categories 2024-05-23 20:12:05 +02:00
OpenXE
e19484b597 versandpaket paketmarke calculate weight of versandpaket 2024-05-23 14:27:32 +02:00
OpenXE
365b87f734 mirakl required fields 2024-05-22 13:37:30 +02:00
OpenXE
f479a12c84 mirakl offer export 2024-05-22 11:25:35 +02:00
OpenXE
5c96cff8c3 onlineshops changed options layout 2024-05-22 11:25:13 +02:00
OpenXE
823f35e44d Bugfix shop error message 2024-05-22 11:23:49 +02:00
OpenXE
bcc2f8f879 Merge remote-tracking branch 'origin/mirakl' into mirakl 2024-05-17 16:50:19 +02:00
OpenXE
55e7934fe4 mirakl Zwischenstand 2024-05-16 20:39:44 +02:00
OpenXE
a7569785c8 Upgrade inline PDF viewer Mozilla pdfjs-4.2.67 2024-05-15 14:28:04 +02:00
OpenXE
9d71d9812f mirakl Zwischenstand 2024-05-14 11:00:56 +02:00
OpenXE
9d547c6e52 Shop Mirakl initial copied from Presta 2024-05-13 14:43:33 +02:00
OpenXE
94c82bf377 exportbuchhaltung ommit 0 values 2024-05-12 10:21:43 +02:00
OpenXE
c763a5bc0b Bugfix edit auftrag Gruppenueberschrift jquery ui ajax 2024-05-12 10:14:00 +02:00
OpenXE
04a4a54418 Bugfix Exportbuchhaltung Belegfeld 1 length 36 instead of 12 2024-05-07 11:02:44 +02:00
OpenXE-ERP
5b21ee0332
Merge pull request #142 from exciler/subscriptioncycle_bugfix
Subscriptioncycle bugfix
2024-05-07 10:30:14 +02:00
OpenXE-ERP
a84af0b890
Merge pull request #143 from exciler/issue_141
Bugfix: Header menu icons not sticky with expanded sidebar
2024-05-07 10:21:34 +02:00
OpenXE
3540153c41 Revert "removed the annoying poll thingy"
This reverts commit 75bd5bea91.
2024-05-07 10:15:47 +02:00
Andreas Palm
e80cc97a0f Bugfix: Header menu icons not sticky with expanded sidebar 2024-05-03 12:11:06 +02:00
OpenXE
6d0b0006b7 Bugfix typos onlineshop_tasks -> onlineshops_tasks 2024-04-30 14:52:34 +02:00
Andreas Palm
05906533dd Filter supported subscription cycle types to prevent errors 2024-04-25 19:47:32 +02:00
Andreas Palm
386d1b0f29 Merge branch 'refs/heads/exciler_pr' into matrixartikel 2024-04-24 15:44:25 +02:00
Andreas Palm
db1ab2baf0 MatrixProduct: Add function to create missing Variants, some bugfixes 2024-04-24 15:44:08 +02:00
OpenXE
5c1a5d04df Email send bugfix empty recipients, bugfix IMAP error display 2024-04-17 16:34:00 +02:00
Andreas Palm
df4c8bd89a vite build 2024-04-15 22:14:33 +02:00
OpenXE
c1727b389e ticket system added content security policy, resizeable view for ticket nachricht 2024-04-15 18:28:11 +02:00
OpenXE
42d9e856e0 removed content security policy for xentral.com *.xentral.com xentral.biz *.xentral.biz *.wawision.de *.embedded-projects.net maps.googleapis.com maps.gstatic.com 2024-04-12 12:25:14 +02:00
OpenXE
dcbce62afb ticket allow list tags in secure view 2024-04-12 11:06:37 +02:00
OpenXE
3f66d92903 erpapi files createdatei added escaping 2024-04-11 16:57:00 +02:00
OpenXE
51a6c07085 ticket blink eye warning hidden elements 2024-04-11 12:33:17 +02:00
OpenXE-ERP
1f14f1829b
Merge pull request #137 from exciler/matrixartikel
MatrixProdukt: Fix SQL and hide Table when no groups are defined
2024-04-08 11:42:55 +02:00
Andreas Palm
d39af1c26f MatrixProdukt: Fix SQL and hide Table when no groups are defined 2024-04-08 11:22:46 +02:00
OpenXE-ERP
d18c17c797
Merge pull request #128 from exciler/matrixartikel
Matrixartikel RC1
2024-04-07 14:39:19 +02:00
OpenXE-ERP
606cf543d1
Merge pull request #132 from exciler/bogx_configurator
Bogx configurator (Shopware6)
2024-04-07 14:38:20 +02:00
OpenXE-ERP
6fb17e9945
Merge pull request #133 from exciler/tracking_versandpakete
Tracking versandpakete
2024-04-07 14:35:51 +02:00
OpenXE-ERP
61d2e11bf1
Merge pull request #135 from exciler/followups_versandpakete
Followups versandpakete
2024-04-07 14:34:34 +02:00
OpenXE
7cfeac81aa Bugfix artikel list filter artikelkategorie 2024-04-05 11:24:35 +00:00
Andreas Palm
383f22b9f5 Remove obsolete code 2024-04-04 15:46:48 +02:00