Commit Graph

843 Commits

Author SHA1 Message Date
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
Andreas Palm
fecf7f5923 Followup versandpakete: verkaufszahlen 2024-04-04 15:12:26 +02:00
Andreas Palm
3836b2ed0e Prestashop: Fix property accessor 2024-04-03 22:02:13 +02:00
Andreas Palm
bca6aa04ef Remove old unused code from erpapi 2024-04-03 22:02:13 +02:00
Andreas Palm
1ab2bea2f1 Fix broken ShopUpdates after move to "versandpakete" 2024-04-03 22:02:13 +02:00
Andreas Palm
17c694a23c Remove Bogx debug output 2024-03-29 21:29:58 +01:00
OpenXE
515bb51b6e bugfix import article from shop 2024-03-27 13:04:25 +00:00
Andreas Palm
59c567aa00 Improve Sendcloud error handling, prevent multiple form submission 2024-03-27 00:17:00 +01:00
OpenXE
d284b8e254 shopexport shopware6 texteuebertragen option 2024-03-26 14:04:31 +00:00
OpenXE
1817efcd44 added texteuebertragen option to shopexport 2024-03-26 11:38:39 +00:00
OpenXE
c3d60a48fd upgrade new function drop_keys 2024-03-26 10:55:53 +00:00
OpenXE-ERP
37ed5ba246
Merge pull request #130 from exciler/shopware6_improvements
Shopware6 improvements
2024-03-26 10:34:20 +01:00
Andreas Palm
10c077006d Shopware6: fix extended Prices 2024-03-25 21:25:36 +01:00
Andreas Palm
d39f9bb2fe Shopware6: improvements and fixed regarding property-groups 2024-03-25 21:25:36 +01:00
Andreas Palm
85c699f5ee Shopware6: pass through "umsatzsteuer" for variants, fix "ermaessigt" 2024-03-25 21:25:35 +01:00
Andreas Palm
9eb958a1a6 Shopware6: apply taxId on variants as well and small bug fixes (maybe for PHP8.1) 2024-03-25 21:25:35 +01:00
Andreas Palm
6feaa03b8e Shopware: Shopware TaxId can be defined in config (e.g. if multiple countries with different tax rates and a different default values are used) 2024-03-25 21:25:35 +01:00
OpenXE
00276d40bb versandpakete added projekt to lieferungen 2024-03-21 12:29:08 +00:00
OpenXE
7808e48b6c Auftrag added projekt in versanduebergabe 2024-03-21 12:21:43 +00:00
OpenXE
362d035140 bugfix verkaufszahlen 2024-03-20 14:42:54 +00:00
OpenXE
56cfc54aa5 Paketmarke autoselect product according to weight 2024-03-19 18:10:43 +00:00
OpenXE
45a75b4298 mahnung add PDF to rechnung datei 2024-03-18 10:07:07 +00:00
Andreas Palm
f442555156 Small bugfix regarding groupEdits 2024-03-15 22:22:27 +01:00
Andreas Palm
36c751d317 Improvements for BogxProductConfigurator (Shopware6) 2024-03-15 21:41:05 +01:00
OpenXE
358d36f2d0 removed defective add button on rechnung add article manually 2024-03-15 09:25:32 +00:00
OpenXE
c3e060bdd4 bugfix auftrag lieferadresse JS 2024-03-13 12:46:38 +00:00
OpenXE
0b4e0c9c2c bugfix adresse ansprechpartner 2024-03-13 12:18:08 +00:00
OpenXE
2ff37db45a bugfix send document empty recipient 2024-03-13 11:18:57 +00:00
OpenXE
da40a201df rechnung removed rechnung zu verbindlichkeit 2024-03-13 09:45:11 +00:00
Andreas Palm
5b33e09021 Add Support for BogxProductConfigurator (Shopware6) 2024-03-08 22:45:18 +01:00
OpenXE
28490aa575 bugfix buchhaltung konto from artikel 2024-03-07 12:57:52 +00:00
OpenXE-ERP
d0b414b9f6
Merge pull request #126 from exciler/Fix_ArtikelStandardbild
use "sort" field when choosing default image
2024-03-06 20:41:14 +01:00
OpenXE-ERP
4dcca0949d
Merge pull request #125 from ToniF23/master
Fix Typo
2024-03-06 20:40:50 +01:00
Andreas Palm
f2589cc0e9 use "sort" field when choosing default image 2024-03-05 23:19:05 +01:00
Andreas Palm
eca32e6d6e remove old code 2024-02-28 20:11:48 +01:00
OpenXE
42701becb1 bugfix getStyleElement = 0 2024-02-27 10:19:59 +01:00
OpenXE
4b9fa3f92a Bugfix freitext1, freitext2 sql exception CRM brief 2024-02-26 21:29:20 +01:00
Toni Friedrich
36c332a52c Fix Typo 2024-02-26 08:28:09 +01:00
OpenXE
5315817467 Angebot totals optional only when not empty 2024-02-23 17:25:11 +01:00
OpenXE
bce18dcece Merge branch 'amperios' 2024-02-19 19:40:02 +01:00
OpenXE
9fc07ca3df bugfix lieferantengutschrift positionen hinzufuegen 2024-02-19 12:50:37 +01:00
OpenXE
345bbc5a9d bugfix buchhaltung export erloes 2024-02-14 10:33:51 +01:00
OpenXE
dd713c2286 bugfix lageretiketten 2024-02-12 19:45:43 +01:00
OpenXE
c89c36e596 exportbuchhaltung added new verbindlichkeit, lieferantengutschrift 2024-02-10 18:07:29 +01:00
OpenXE
4d5b46e903 bugfix ticket htmlentities betreff 2024-02-09 21:00:57 +01:00
OpenXE
7b1d12d59b bugfix artikel instueckliste sum view 2024-02-09 14:53:14 +01:00
OpenXE
c6ee9c0faf bugfix lieferantengutschrift menge max 2024-02-09 10:49:18 +01:00
OpenXE
324c7dbf17 lieferantengutschrift sortcols 2024-02-08 20:43:58 +01:00
OpenXE
4e5011c5f5 lieferantengutschrift artikel manuell bruttopreise 2024-02-08 20:37:07 +01:00
OpenXE
885cf37d29 FirmendatenSet -> AddNeuenFirmendatenWert 2024-02-08 17:56:01 +01:00
OpenXE
e348560cf7 lieferantengutschrift artikell manuell 2024-02-08 16:15:39 +01:00
OpenXE
c3cbf0d214 bugfix verbindlichkeit positionen 2024-02-08 14:17:56 +01:00
OpenXE
c5cf7bcba4 angebot optional positions with ellipsis, added optional total 2024-02-07 20:45:34 +01:00
OpenXE
ca4e320085 lieferantengutschrift positionen 2024-02-07 17:57:11 +01:00
OpenXE
8dc86fdddf Lieferantengutschrift initial 2024-02-05 21:58:08 +01:00
OpenXE
4a5a723a15 wareneingang reopen 2024-02-05 12:18:52 +01:00
OpenXE
0360d5657f bugfix angebot Alternativ Text Preis 2024-02-05 11:58:36 +01:00
OpenXE
2efc34c280 bugfix AN AB RE GS ust ausblenden 2024-02-04 21:54:43 +01:00
OpenXE
2ff5c007c1 added belegvorlagen from OSS 20.1 2024-02-03 12:49:37 +01:00
OpenXE
4acb921b51 bugfix emailbackup testmail utf-8 2024-01-31 18:38:53 +01:00
OpenXE
40734ccd66 Bugfix emailbackup 2024-01-31 18:35:16 +01:00
OpenXE
2b29457763 mailsend bugfix UTF-8 2024-01-30 11:13:07 +01:00
Andreas Palm
b8ae1a7f23 Merge branch 'master' into matrixartikel
# Conflicts:
#	.gitignore
2024-01-25 22:34:02 +01:00
OpenXE
2dcc5b664e export buchhaltung added internet from auftrag, zahlweise 2024-01-25 19:09:53 +01:00
OpenXE
63b85f213a angebot deckungsbeitrag 2024-01-24 18:27:34 +01:00
OpenXE
24905d3674 emailbackup edit page form cleanup 2024-01-23 18:17:55 +01:00
OpenXE
4570cbc342 Bugfix rechnung abweichendebezeichnung 2024-01-23 14:38:24 +01:00
Andreas Palm
74fa1ca74e vite run 2024-01-22 22:21:01 +01:00
OpenXE
08d97478d1 bugfix rechnungslauf 2024-01-22 13:38:21 +01:00
OpenXE
ce6ffb0580 bugfix crossselling shopexport 2024-01-21 13:36:58 +01:00
OpenXE-ERP
dd8421eac6
Merge pull request #113 from creatronics-de/231225-Alternative-Rechnungs-bezeichnung-als-standard
alternative Bezeichnung für Rechnungen als Standard
2024-01-20 13:52:45 +01:00
OpenXE
3c57df65e6 wareneingang bugfix limit menge 2024-01-19 13:46:29 +01:00
OpenXE
169a5c34c5 Berichte create report from preview 2024-01-19 10:02:27 +01:00
OpenXE
567976ecda Berichte Datenbankansicht 2024-01-18 19:47:20 +01:00
OpenXE
f6129a6ef7 verbindlichkeit bugfix PDF merge error 2024-01-18 13:08:56 +01:00
OpenXE
5948b728d2 verbindlichkeit improvements 2024-01-17 17:32:14 +01:00
OpenXE
cb49810251 wareneingang impovements 2024-01-17 17:03:34 +01:00
OpenXE
5abde88596 wareneingang from bestellung with kommentar 2024-01-16 11:14:46 +01:00
OpenXE
c0de40ac86 verbindlichkeit preise 5 decimals 2024-01-16 10:26:41 +01:00
OpenXE
fdad52f168 wareneingang manuell multifilter 2024-01-15 15:24:28 +01:00
OpenXE
1baf957891 bugfix verbindlichkeit set sachkonto 2024-01-15 14:58:20 +01:00
OpenXE
b9bec98855 wareneingang add manuelle list, wareneingang filter abgeschlossene 2024-01-15 14:41:48 +01:00
OpenXE
f148fbdf08 verbindlichkeit set sachkonto of multi positions 2024-01-13 12:46:14 +01:00
OpenXE
602bc38585 verbindlichkeit added bemerkung from wareneingang 2024-01-13 12:31:33 +01:00