379 Commits

Author	SHA1	Message	Date
OpenXE	b701a880a4	Merge remote-tracking branch 'github/master' into develop.1.8.1	2023-04-01 22:39:15 +02:00
OpenXE	2b573268fa	fibu buchungen	2023-04-01 20:42:37 +02:00
OpenXE	689fdb0490	Kontoauszuege konto overview and saldo	2023-03-30 19:29:46 +02:00
OpenXE	ebc7034164	firmendaten hotfix freifelder	2023-03-30 12:39:04 +02:00
OpenXE	3715c2f205	firmendaten hotfix freifelder	2023-03-30 12:33:38 +02:00
OpenXE	b7153c423c	fibu_buchungen added, rework of zahlungen auftrag, rechnung, gutschrift	2023-03-28 12:30:57 +02:00
Andreas Palm	c361a82583	add "empty" to versandarten module list	2023-03-27 15:27:20 +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	23dc74cd08	Bugfix versandart no module (dummy)	2023-03-25 20:51:16 +01:00
OpenXE	691ad237b5	Merge branch 'develop.1.8'	2023-03-25 20:38:27 +01:00
OpenXE	c220639e82	Zahlungsstatus Rechnung Gutschrift reworked with fibu_buchungen	2023-03-25 17:50:04 +01:00
Andreas Palm	696e9efc76	improve stability of versandarten	2023-03-23 23:22:45 +01:00
Andreas Palm	34def013f7	change default handler to "list", fix TableSearch findcols	2023-03-23 22:28:48 +01:00
OpenXE	6a566a99af	Kontoauszuege module & importer	2023-03-22 20:37:17 +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	ecd86d120a	Bugfix lager wert calculation of prices added geloescht != 1 and date range	2023-03-14 13:43:36 +01:00
OpenXE	8dd78dfa55	Bugfix lager wert calculation of prices added geloescht != 1 and date range	2023-03-14 13:40:14 +01:00
OpenXE	71883d34ae	Zahlungseingang Minidetail hacked rechnung, gutschrift	2023-03-13 17:12:38 +01:00
OpenXE	73dbbb061a	Geschaeftskonto module restored (basic variant)	2023-03-13 14:22:39 +01:00
OpenXE-ERP	5638f18770	Merge pull request #67 from exciler/bugfix_gutschrift_php8 ... fix index accessor for new PHP Versions (implicit const string)	2023-03-13 13:22:04 +01:00
OpenXE-ERP	8f76574d00	Merge pull request #67 from exciler/bugfix_gutschrift_php8 ... fix index accessor for new PHP Versions (implicit const string)	2023-03-13 13:00:35 +01:00
OpenXE-ERP	f5b326682c	Merge pull request #57 from exciler/prestashop ... Prestashop	2023-03-13 13:00:06 +01:00
OpenXE-ERP	f02be869d0	Merge pull request #52 from exciler/subscriptioncycle ... Subscriptioncycle	2023-03-13 12:59:50 +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
Andreas Palm	28fc3f6bd3	fix index accessor for new PHP Versions (implicit const string) in rechnung.php	2023-03-12 22:26:44 +01:00
Andreas Palm	2d0e9cd8f1	fix index accessor for new PHP Versions (implicit const string)	2023-03-12 22:15:52 +01:00
OpenXE	e9cec0ce30	Buchhaltung Export verbindlichkeit rechnungsdatum + bugfix consistency	2023-03-10 13:12:57 +01:00
OpenXE	226a2dffdf	Export Buchhaltung added consistency check	2023-03-10 11:04:58 +01:00
OpenXE	44781b52bb	Export Buchhaltung first version	2023-03-09 16:40:25 +01:00
OpenXE	245e2d1545	onlineshops added tab artikelliste	2023-03-05 11:25:14 +01:00
OpenXE	49c934ede4	Kontenrahmen missing files added	2023-03-02 10:19:31 +01:00
OpenXE	61047af440	Zolltarifnummer module restored	2023-03-02 10:19:04 +01:00
OpenXE	2ffee66e00	Kontenrahmen module restored, also importvorlage for kontenrahmen implemented	2023-03-01 16:27:52 +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
Andreas Palm	62de5cdacf	add copyright/license	2023-02-27 10:39:04 +01:00
Andreas Palm	d23c0f09dd	apply customer language	2023-02-21 17:14:56 +01:00
OpenXE	c00ae0eb5b	Bugfix Firmendaten default entries are not there, thus not editable	2023-02-17 12:22:07 +01:00
OpenXE	4be2d5af23	Lager Lagerbestandsberechnung removed group by lager, bugfixes regarding calculations	2023-02-15 16:38:48 +01:00
OpenXE	1e371e7377	Lager LagerBuchenEinlagern corrected misleading message "Regal gibt es nicht"	2023-02-13 10:31:33 +01:00
OpenXE	2397fda1e6	Lager Bestandsberechnung rewrite of the SQL statements, removed last stock movement	2023-02-12 19:41:01 +01:00
OpenXE	0572295637	Lager bestandsberechnung bugfix currencies	2023-02-08 16:24:30 +01:00
OpenXE	770a36b183	Produktion lager stock remove parts with production number	2023-02-06 15:00:34 +01:00
OpenXE	826923fd51	Bugfix waehrungumrechnung	2023-02-06 14:33:51 +01:00
OpenXE	9657e16797	Bugfix Lagerbestandsberechnung	2023-02-06 14:31:20 +01:00
Andreas Palm	9defde81ae	Lieferschein/Paketmarke: Check for valid options before loadVersandModul	2023-02-06 13:08:53 +01:00
Andreas Palm	f495964d2b	Prestashop: add missing strval() calls	2023-02-05 22:22:44 +01:00
OpenXE	aff5eef945	Waehrumgumrechnung module restored	2023-02-05 13:23:03 +01:00
OpenXE	3d8c7a13e3	Lager Lagerbestandsberechnung restored	2023-02-04 19:05:22 +01:00
OpenXE	f0bebba1ff	Ticket system bufix escaping of subject text	2023-02-01 10:16:24 +01:00
Andreas Palm	36322b0171	Prestashop: fix typo	2023-01-31 12:19:09 +01:00
Andreas Palm	406811872c	Prestashop: Tracking and shipping costs w/o tax	2023-01-31 12:08:25 +01:00
Andreas Palm	88eb1757b2	Fix usage of Versandarten by cronjobs	2023-01-29 23:38:34 +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	100024391d	Bugfixes presta, support for project specific number ranges	2023-01-29 14:34:47 +01:00
Andreas Palm	1af809954c	Bugfix shopimport, bugfixes presta, support for project specific number ranges	2023-01-29 12:08: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	d705d1a3eb	Small bugfix in presta importer, improve steuersaetze.php	2023-01-29 00:56:37 +01:00
Andreas Palm	5539c9849c	Presta shopimporter	2023-01-28 13:04:28 +01:00
OpenXE	bb3a68042d	ticket system ensure status offen on self-assigned tickets	2023-01-19 09:27:23 +01:00
OpenXE	d89c23ad0e	bugfix ticket system mail addresses with long tld > 4 characters	2023-01-18 14:41:12 +01:00
OpenXE	cb3191393a	Bugfix ticket system letzte aktion	2023-01-17 10:31:10 +01:00
OpenXE	0b4be37433	Bugfix ticket system ticket to self	2023-01-16 18:37:32 +01:00
OpenXE	9a721758a9	Improvements Ticket system, date format, mail address search	2023-01-16 18:10:01 +01:00
OpenXE	424d77a795	Bugfix artikel profisuche	2023-01-13 22:02:42 +01:00
OpenXE	357497f10f	Uebersetzung rich text	2023-01-13 12:01:45 +01:00
OpenXE	f9550ca18b	Bugfix auftrag offenepositionen	2023-01-13 10:42:03 +01:00
Andreas Palm	fe7d4332c8	Merge remote-tracking branch 'upstream/master' into subscriptioncycle	2023-01-12 21:52:56 +01:00
OpenXE	99eed95d85	Bugfix ticket email draft, set sender and sendername later when sending	2023-01-12 17:58:54 +01:00
OpenXE	c9a24e7f75	Bugfix produktion projekt selection	2023-01-12 16:51:58 +01:00
OpenXE	f535679263	Auftrag offene positionen	2023-01-12 16:20:31 +01:00
OpenXE	613d45b1cc	Ticket system improvements for import encoding, ticket system limited display of html elements (strip_tags)	2023-01-12 00:01:20 +01:00
OpenXE	1fdd6dbf95	Bugfix produktion non-stock artikel	2023-01-11 12:08:23 +01:00
OpenXE	cad0103b7f	Translations for documents -> fill out table uebersetzungen	2023-01-10 14:13:19 +01:00
OpenXE	57d0592a9a	Bugfix ticket mail citation	2023-01-09 11:16:39 +01:00
OpenXE	f76400e248	Bestellvorschlag now working	2023-01-08 18:51:29 +01:00
OpenXE	3c7e189acb	Bugfix importvorlage verkaufspreise	2023-01-05 12:53:05 +01:00
OpenXE	78e56ab160	Bugfix ticket system new mail signature	2023-01-03 12:44:51 +01:00
OpenXE	ab65feb455	Bestellvorschlag with parameter absatz and voraus	2023-01-02 11:29:53 +01:00
OpenXE	5b74049f5c	Bestellvorschlag table for saved values and auftrag WIP	2023-01-01 17:52:45 +01:00
root	aa3dea0277	bestellvorschlag with subselect only > 0 WIP	2022-12-29 17:43:24 +01:00
OpenXE	67d7a63898	bestellvorschlag new module WIP	2022-12-29 16:28:37 +01:00
Andreas Palm	781fbc2600	Merge remote-tracking branch 'upstream/master' into subscriptioncycle	2022-12-27 21:29:43 +01:00
OpenXE	d94c05383a	ticket system design improvements, subject in info box, optimized space usage, bugfix warteschlange autocomplete	2022-12-23 19:55:48 +01:00
OpenXE	135017158c	Log with milliseconds	2022-12-23 19:12:52 +01:00
Andreas Palm	474970e358	Fix PHP 7 compat	2022-12-22 22:27:27 +01:00
Andreas Palm	6e8f715f66	Create module rechnungslauf, basic version	2022-12-22 00:16:33 +01:00
OpenXE	0648e57b63	Bugfix for use of BCC for all mails	2022-12-21 15:05:05 +00:00
OpenXE	143e4e96bd	ticket system minor design improvement	2022-12-21 09:34:33 +00:00
OpenXE	2cfe710c9a	bugfixe auftrag minidetail versandzentrum	2022-12-19 12:49:16 +00:00
OpenXE	35f6532520	Teilauftrag WIP	2022-12-16 17:33:15 +00:00
OpenXE	0848148b9e	shopimporter_shopware6 removed v2 from URL to allow shopware 6.4 api	2022-12-15 10:40:10 +00:00
OpenXE	ca9b48cb58	upgrade some usability improvements, upgrade.sh script	2022-12-14 17:12:12 +00:00
OpenXE	817dd802aa	upgrade added info and -o option	2022-12-14 15:25:48 +00:00
OpenXE	724c57d309	upgrade improved folder handling, git init	2022-12-13 18:40:13 +00:00
OpenXE	3ea5c0e478	upgrade added external connection option, optimized db_schema.json (views now with brackets around expressions)	2022-12-09 07:13:12 +00:00
OpenXE	08262cce5c	upgrade from frontend improvements	2022-12-06 20:05:41 +00:00
OpenXE	ce268dca0e	upgrade and database_compare combined, database_compare removed. View "belegeregs" removed.	2022-12-06 17:02:00 +00:00
OpenXE	e4773da6f0	Upgrade from frontend	2022-12-05 22:29:48 +00:00
OpenXE	a041c6a82c	Merge branch 'master' into develop	2022-12-03 11:43:11 +00:00
OpenXE	1a343b4b55	Bugfix www/pages/shopimporter_shopware6.php typo	2022-12-03 10:03:28 +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	b5926ee039	Bugfix www/pages/shopimporter_shopware6.php	2022-12-02 12:19:42 +00:00
OpenXE	ae261d7a47	Removed xentral update functions	2022-12-02 11:20:02 +00:00
OpenXE	76603076cd	Produktion typo bugfix	2022-11-21 11:48:51 +00:00
OpenXE	17fa438529	Produktion show no available material when no lager selected, Lager renamed Materiallager	2022-11-18 16:58:16 +01:00
OpenXE	14e64b8f4b	Produktion Lager verfuegbar alle	2022-11-18 16:22:34 +01:00
OpenXE	df028888e9	Produktion remove old msg on submit	2022-11-18 16:14:02 +01:00
OpenXE	625b9627e8	Produktion minor bugfixes	2022-11-17 17:56:58 +01:00
OpenXE	3ee518af03	Produktion ziellagerplatz, use lagerplatz of artikel or produktion	2022-11-16 12:17:16 +00:00
OpenXE	8518e327aa	Produktion cosmetic	2022-11-15 16:40:37 +00:00
OpenXE	84cdd8754a	Produktion Protokoll	2022-11-15 16:24:21 +00:00
OpenXE	7c468dbced	Produktion minidetail	2022-11-15 14:50:59 +00:00
OpenXE	ba31fc62cf	Produktion copy	2022-11-15 11:30:25 +00:00
OpenXE	f6a1315192	Produktion go to edit after new item	2022-11-15 09:16:58 +00:00
OpenXE	c219c32212	Bugfix Produktion new item	2022-11-11 17:07:42 +00:00
OpenXE	e1b8b7864f	Produktion filter list	2022-11-11 15:14:59 +00:00
OpenXE	822960b9f0	Bugfix Produktion refresh all icons on list action	2022-11-11 15:22:04 +01:00
OpenXE	0fef7146c6	Produktion refresh all icons on list action	2022-11-11 14:16:46 +00:00
OpenXE	27d48a55bb	Produktion adjust reservation if there is scrap, fixed icons TBD: cronjob for icon update	2022-11-10 21:42:53 +00:00
OpenXE	06dbb9b8b8	Produktion improvement using functions, production progress with reserved quantity	2022-11-10 19:48:34 +00:00
OpenXE	99d5804ffa	Added user edit check DisableModuls	2022-11-10 16:00:25 +00:00
OpenXE	3d37049ea1	Produktion menge anpassen	2022-11-10 12:08:30 +01:00
OpenXE	1bf8f567b4	Bugfix Produktion reservieren	2022-11-10 10:32:03 +01:00
OpenXE	39e741a595	Bugfix Produktion teilproduktion preserve old values, bugfix list view artikel name	2022-11-10 10:10:04 +01:00
OpenXE	e2120d1862	Bugfix Produktion auslagern	2022-11-09 17:19:20 +01:00
OpenXE	8c67d97728	Produktion teilen, leeren	2022-11-09 14:48:09 +00:00
OpenXE	3b804ef745	Produktion Teilproduktion WIP	2022-11-08 22:22:27 +00:00
OpenXE	aea469320f	Bugfix Produktion material per artikel	2022-11-08 15:52:33 +01:00
OpenXE	a9cab336d0	Lager reservierungen added column Artikelnummer	2022-11-07 18:15:10 +00:00
OpenXE	4b27887dd2	Bugfix Produktuion display of stock numbers	2022-11-07 17:09:19 +00:00
OpenXE	8c559bf5cf	Produktion column alignment of numbers	2022-11-07 15:52:16 +00:00
OpenXE	ef8b6f7a1f	Bugfix produktion list	2022-11-07 16:23:16 +01:00
OpenXE	348d946637	Bugfix intial produktion status	2022-11-07 16:08:25 +01:00
OpenXE	cadbf08376	Produktion show open quantities	2022-11-07 16:05:56 +01:00
OpenXE	68723b7c4b	Bugfix Produktion number format	2022-11-07 14:00:51 +00:00
OpenXE	e6188d9153	Bugfix Produktion list artikel	2022-11-07 13:28:35 +00:00
OpenXE	ea5ac90b13	Bugfix Produktion empty status	2022-11-07 11:29:43 +00:00
OpenXE	8032bf779a	Merge branch 'master' into develop	2022-11-06 20:17:17 +00:00
OpenXE	ed5d1690ef	Bugfix Produktion icons	2022-11-06 18:46:57 +00:00
OpenXE	c0380142ba	WIP Produktion edit postions	2022-11-06 18:42:42 +00:00
OpenXE	cfbc602443	WIP Produktion material needed per item	2022-11-06 15:18:54 +00:00
OpenXE	e249d5a715	WIP Produktion formatting	2022-11-06 15:06:13 +00:00
OpenXE	411ab85359	WIP Produktion process with stock removal, reservation and stock adding	2022-11-04 15:39:12 +00:00
OpenXE	9f616fc0e5	Produktion WIP list view improvements	2022-11-03 21:48:12 +00:00
OpenXE	2e6d57e93a	Produktion WIP reservieren bugfix	2022-11-03 21:30:14 +00:00
OpenXE	dc6827fc1e	Produktion WIP aggregated view on material items	2022-11-03 14:49:42 +00:00