Commit Graph

247 Commits

Author SHA1 Message Date
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
e19484b597 versandpaket paketmarke calculate weight of versandpaket 2024-05-23 14:27:32 +02:00
OpenXE
55e7934fe4 mirakl Zwischenstand 2024-05-16 20:39:44 +02:00
OpenXE
9d547c6e52 Shop Mirakl initial copied from Presta 2024-05-13 14:43:33 +02:00
OpenXE
5c1a5d04df Email send bugfix empty recipients, bugfix IMAP error display 2024-04-17 16:34:00 +02:00
OpenXE
3f66d92903 erpapi files createdatei added escaping 2024-04-11 16:57:00 +02:00
OpenXE-ERP
d18c17c797
Merge pull request #128 from exciler/matrixartikel
Matrixartikel RC1
2024-04-07 14:39:19 +02:00
OpenXE-ERP
6fb17e9945
Merge pull request #133 from exciler/tracking_versandpakete
Tracking versandpakete
2024-04-07 14:35:51 +02:00
Andreas Palm
383f22b9f5 Remove obsolete code 2024-04-04 15:46:48 +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
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
Andreas Palm
85c699f5ee Shopware6: pass through "umsatzsteuer" for variants, fix "ermaessigt" 2024-03-25 21:25:35 +01:00
OpenXE
56cfc54aa5 Paketmarke autoselect product according to weight 2024-03-19 18:10:43 +00:00
OpenXE
2ff37db45a bugfix send document empty recipient 2024-03-13 11:18:57 +00:00
OpenXE
28490aa575 bugfix buchhaltung konto from artikel 2024-03-07 12:57:52 +00:00
Andreas Palm
f2589cc0e9 use "sort" field when choosing default image 2024-03-05 23:19:05 +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
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
dd713c2286 bugfix lageretiketten 2024-02-12 19:45:43 +01:00
OpenXE
885cf37d29 FirmendatenSet -> AddNeuenFirmendatenWert 2024-02-08 17:56:01 +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
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
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
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
2cd60b0bd8 bugfix differenz_auslieferung_tage < 2 2024-01-13 10:35:45 +01:00
OpenXE
580aef2bf6 bugfix bestellung ohne preise PDF 2024-01-02 19:18:27 +01:00
creatronics-de
eae4644921
Merge branch 'OpenXE-org:master' into 231225-Alternative-Rechnungs-bezeichnung-als-standard 2023-12-31 17:36:24 +01:00
OpenXE
ae377e452f bugfix GetZahlungsweise empty array 2023-12-29 11:14:28 +01:00
OpenXE
dc5de062b8 Merge branch 'verbindlichkeit' 2023-12-27 18:19:20 +01:00
ibs
302bfee669 alternative Bezeichnung für Rechnungen als Standard per Settings festlegen 2023-12-25 23:28:04 +01:00
OpenXE
8664e16c55 zwischenstand verbindlichkeit status, forms, positions 2023-12-13 18:27:08 +01:00
Andreas Palm
a0d4cd1ff3 Matrixproducts first beta 2023-12-11 11:13:30 +01:00
OpenXE-ERP
aabdc74af6
Merge pull request #104 from exciler/shopware-multiVersion
Make Shopware-Lib compatible with 6.x
2023-12-10 10:21:55 +01:00
OpenXE
3bc0eafc51 erpapi bugfix lager_seriennummern 2023-12-09 12:25:29 +01:00
OpenXE
12f5ca8211 logistik ein-auslagern menu change to listview 2023-12-05 11:52:01 +01:00
OpenXE
bbf8b071c0 Zwischenstand 2023-12-02 15:05:14 +01:00
OpenXE
72684cb092 auftrag deckungsbeitrag write einkaufspreis into auftrag_position 2023-11-14 11:38:14 +01:00
OpenXE
2f646a7715 versand added tracking for mail variables, minor bugfixes 2023-11-02 11:56:05 +01:00
OpenXE
7dcaae7fbb Paketmarke changed texts 2023-10-26 20:56:18 +02:00
OpenXE
18397a03c8 Paketmarke added info text Gewicht 2023-10-26 20:51:47 +02:00
OpenXE
504f0beb54 Paketmarke added doctype to text 2023-10-26 20:46:07 +02:00
OpenXE
a5be2e984a versandpakete improvements, added lieferungen view 2023-10-25 13:26:52 +02:00
OpenXE
fb32cda643 versand bugfix no countries defined 2023-10-22 18:41:08 +02:00
OpenXE
a35ab21f7c versandpakete improvements 2023-10-20 15:47:37 +02:00
OpenXE
e899b1c389 versandpakete intermediate 2023-10-18 14:35:35 +02:00
OpenXE
b171dd7760 restored function VersandartMindestgewicht($id=0) in erpapi 2023-10-16 21:28:43 +02:00
OpenXE
4f7eb4049b versandpakete initial 2023-10-16 21:22:21 +02:00
OpenXE
b838b63258 removed deprecated paketmarke functions from erpapi 2023-10-10 18:17:42 +02:00
Andreas Palm
4dd8b01ea9 Shopware6: remove "v2" part from URL in Client-lib as well, set pseudolager default to 0 instead of empty string 2023-09-19 14:26:40 +02:00
OpenXE
91c2dc88ba document send preselect default mail address from firmendaten 2023-08-15 12:37:16 +02:00
Andreas Palm
7df897d9d7 Prestashop: import meta infos 2023-07-26 18:47:44 +02:00
Andreas Palm
cb2b75a3ca Prestashop: Improve article import 2023-07-25 00:05:17 +02:00
OpenXE
1c1c7034f1 mahnwesen added CRM for printed dokumente (email not yet implemented) 2023-06-15 17:03:42 +02:00
OpenXE
2c7f113d6b mahnwesen initial 2023-06-13 18:35:59 +02:00
OpenXE
1f6caa8632 mahnwesen initial 2023-06-08 15:35:46 +02:00
OpenXE
73725a31bb rechnung calculate payment status with skonto 2023-06-07 15:40:36 +02:00
OpenXE
75bd00770c ticket system show user's tickets and all tickets separately in sidebar 2023-05-22 18:42:20 +02:00
OpenXE
674c7b9958 bugfix send document with ',' in name 2023-05-22 14:01:34 +02:00
OpenXE
4ffeafa5ac bugfix gruppensumme PDF Briefpapier::Cell_typed(): Argument #3 ($txt) must be of type string, null given 2023-05-05 09:58:15 +02:00
OpenXE
b497d65d81 cronjob lagerzahlen set cache_lagerplatzinhaltmenge only on success 2023-04-27 18:07:08 +02:00
OpenXE
87a884bd8a Bugfix auftrag vorkasse_ok 2023-04-26 11:10:07 +02:00
OpenXE
7de88ca3b5 gutschrift freigabe with our without offsettung against rechnung, with offsetting creates fibu_buchung 2023-04-21 14:59:02 +02:00
OpenXE
17bdb1c5e1 auftrag set vorkasse_ok according to fibu_buchungen 2023-04-13 21:58:11 +02:00
OpenXE
ea6a6a5dda rechnung removed all updates of ist, except from fibu_buchungen 2023-04-11 15:40:23 +02:00
OpenXE
69172672b2 fibu_buchhaltung belege zuordnen multi option 2023-04-11 15:20:40 +02:00
OpenXE
44af8f3b3d Bugfix erpapi lagernummern typo 2023-04-07 18:17:57 +02:00
OpenXE
82fc367405 fibu_buchungen einzelzuordnung 2023-04-06 15:33:53 +02:00
OpenXE
b701a880a4 Merge remote-tracking branch 'github/master' into develop.1.8.1 2023-04-01 22:39:15 +02:00
Andreas Palm
e79e2e24d2 Sendcloud: Fix for domestic parcels - use IsEU instead of IstEU :-/ 2023-03-31 22:30:35 +02:00
Andreas Palm
03f51a548a Sendcloud: handle field requirement/null for parcels without customs declaration 2023-03-31 10:21:25 +02:00
Andreas Palm
b6c23399c6 Versanddienstleister: display customs form only for non-EU countries, improve product/method selection 2023-03-30 22:24:40 +02:00
OpenXE
689fdb0490 Kontoauszuege konto overview and saldo 2023-03-30 19:29:46 +02:00
OpenXE
b7153c423c fibu_buchungen added, rework of zahlungen auftrag, rechnung, gutschrift 2023-03-28 12:30:57 +02:00
Andreas Palm
aa93070185 Merge remote-tracking branch 'upstream/master' into sendcloud
# Conflicts:
#	www/pages/versandarten.php
2023-03-27 15:27:10 +02:00
OpenXE
7a83c9fd29 Bugfix briefpapier freitexte width 2023-03-26 13:28:20 +02:00
OpenXE
09039f9d2a Bugfix user avatar 2023-03-26 13:27:49 +02:00
OpenXE
49dfd255e4 Bugfix briefpapier freitexte width 2023-03-26 13:26:49 +02:00
OpenXE
791a12b731 Bugfix user avatar 2023-03-26 13:23:15 +02:00
OpenXE
c220639e82 Zahlungsstatus Rechnung Gutschrift reworked with fibu_buchungen 2023-03-25 17:50:04 +01:00
Andreas Palm
98bbdec8d3 fix link in menu 2023-03-24 00:28:39 +01:00
Andreas Palm
51552e7530 cleanup old versandarten 2023-03-23 23:23:03 +01:00
Andreas Palm
696e9efc76 improve stability of versandarten 2023-03-23 23:22:45 +01:00
OpenXE
e356051f5a Zahlungen improvements 2023-03-22 14:33:34 +01:00
OpenXE
ab91715c20 Zahlungen minidetail and collation of relevant documents as tree 2023-03-16 11:49:45 +01:00
OpenXE-ERP
f5b326682c
Merge pull request #57 from exciler/prestashop
Prestashop
2023-03-13 13:00:06 +01:00
OpenXE-ERP
7623f2fb6a
Merge pull request #26 from exciler/sendcloud
Basic Sendcloud integration with Shipment rework
2023-03-13 12:59:27 +01:00
OpenXE
44781b52bb Export Buchhaltung first version 2023-03-09 16:40:25 +01:00
Andreas Palm
cd73a58ece add copyright/license 2023-02-28 13:40:31 +01:00
Andreas Palm
f37ef6e591 add copyright/license 2023-02-28 13:36:25 +01:00
OpenXE
05714cfd21 Bugfix Shop LagerSync 2023-02-16 10:56:00 +01:00