216 Commits

Author	SHA1	Message	Date
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
OpenXE	ad3207d67c	erpapi FormatMenge default 0 decimal places	2023-02-10 11:08:03 +01:00
Andreas Palm	ef8b79ff19	Versandarten: Bugfix prefill Zolltarifnummer,Herkunftsland	2023-02-05 22:15:54 +01:00
OpenXE	aff5eef945	Waehrumgumrechnung module restored	2023-02-05 13:23:03 +01:00
Andreas Palm	d84b20fafe	Versandarten: Bugfix shipment_type not transmitted	2023-02-01 15:42:03 +01:00
Andreas Palm	aafcb4130f	Versanddienstleister: prefill order number, zolleinzelwert should default to 0 instead of null	2023-01-31 12:12:01 +01:00
Andreas Palm	88eb1757b2	Fix usage of Versandarten by cronjobs	2023-01-29 23:38:34 +01:00
Andreas Palm	b14265b49d	Sendcloud fix error if no export documents are present	2023-01-29 23:38:30 +01:00
Andreas Palm	575ab86157	Sendcloud error handling	2023-01-29 23:38:27 +01:00
Andreas Palm	3fe2c7a5d9	Merge remote-tracking branch 'upstream/master' into sendcloud	2023-01-29 23:37:48 +01:00
Andreas Palm	4eac5fbbdc	Bugfixes presta, support for project specific number ranges	2023-01-29 15:38:30 +01:00
Andreas Palm	bcf2544735	Bugfixes presta, support for project specific number ranges	2023-01-29 14:50:15 +01:00
Andreas Palm	100024391d	Bugfixes presta, support for project specific number ranges	2023-01-29 14:34:47 +01:00
Andreas Palm	0e3afa437b	Bugfix shopimport, bugfixes presta, support for project specific number ranges	2023-01-29 12:06:32 +01:00
Andreas Palm	5539c9849c	Presta shopimporter	2023-01-28 13:04:28 +01:00
OpenXE	9a721758a9	Improvements Ticket system, date format, mail address search	2023-01-16 18:10:01 +01:00
OpenXE	cad0103b7f	Translations for documents -> fill out table uebersetzungen	2023-01-10 14:13:19 +01:00
OpenXE	c006c1c474	bugfix erpapi ANABREGSNeuberechnen	2023-01-04 13:20:23 +01:00
OpenXE	67d7a63898	bestellvorschlag new module WIP	2022-12-29 16:28:37 +01:00
OpenXE	2acc8aceb9	Bugfix count(0) dokumente	2022-12-28 17:08:19 +01:00
OpenXE	0648e57b63	Bugfix for use of BCC for all mails	2022-12-21 15:05:05 +00:00
OpenXE	0afc12e718	bugfix dokumente zahlungsziel not defined ('' vs. 0)	2022-12-17 13:03:53 +00:00
OpenXE	e4773da6f0	Upgrade from frontend	2022-12-05 22:29:48 +00:00
OpenXE	b70676f4a0	Merge branch 'master' into develop	2022-12-02 13:25:22 +00:00
OpenXE	6df7be74b7	Bugfixes for project specific PDF background -> UPGRADE DB with database_compare	2022-12-02 13:21:43 +00:00
OpenXE	9b62b7c247	Merge branch 'master' into develop	2022-12-02 12:15:36 +00:00
OpenXE	d41745ceda	Bugfix of bugfix ClearSqlCache TIMESTAMPDIFF	2022-12-02 12:13:49 +00:00
OpenXE	8c1eb6c3cc	Bugfixes www/lib/dokumente/class.briefpapier.php	2022-12-02 12:04:23 +00:00
OpenXE	d6dcc9f4c6	bugfix ClearSqlCache TIMESTAMPDIFF	2022-12-02 11:31:15 +00:00
OpenXE	ae261d7a47	Removed xentral update functions	2022-12-02 11:20:02 +00:00
Andreas Palm	c37f0d3847	DHL: First test candidate ;-)	2022-11-22 00:21:57 +01:00
Andreas Palm	8ad45ed723	Basic DHL implementation, Refactor redundant code	2022-11-14 22:29:42 +01:00