Commit Graph

520 Commits

Author SHA1 Message Date
OpenXE
5ed516f9da ticket system betreff strip tags 2023-09-21 08:30:05 +02:00
Andreas Palm
b759e2accd Prestashop: small fix to reduce errors in log 2023-09-19 14:39:00 +02:00
Andreas Palm
5d1201637f Prestashop: Import metakeywords 2023-09-19 14:39:00 +02:00
Andreas Palm
c6dd3fdeff bugfix: check for divisionByZero 2023-09-19 14:39:00 +02:00
Andreas Palm
150381a20f Enable "Zahlzyklus" in "Abolauf" 2023-09-19 14:02:01 +02:00
OpenXE
76c770aba3 Bugfix managementboard removed invalid reference RechnungslaufRechnungslauf 2023-09-11 20:42:14 +02:00
OpenXE
be222cc581 bugfix wareneingang bemerkung 2023-08-14 20:57:21 +02:00
OpenXE
a9f3292f8f Bugfix thousand separator and rounding in stueckliste 2023-08-10 21:38:09 +02:00
OpenXE
0262c31e93 Added ticketregel from ticket button 2023-08-02 14:25:38 +02:00
OpenXE-ERP
5557c54fd6
Merge pull request #89 from exciler/prestashop-improve-import
Prestashop improve import
2023-07-27 10:56:14 +02:00
Andreas Palm
7df897d9d7 Prestashop: import meta infos 2023-07-26 18:47:44 +02:00
Andreas Palm
1a94af6b0b Prestashop: import support combinations 2023-07-26 15:26:01 +02:00
Andreas Palm
fa4125d63b Prestashop: strip html tags from short description 2023-07-26 12:38:41 +02:00
Roland Rusch
a32c201a91
Add missing $ 2023-07-25 11:29:26 +02:00
Andreas Palm
cb2b75a3ca Prestashop: Improve article import 2023-07-25 00:05:17 +02:00
OpenXE
1f27f9a5f5 bugfixes shopimporter_shopify 2023-07-22 13:14:43 +02:00
OpenXE-ERP
869c888947
Merge pull request #86 from RETROTEC-AG/pr/#7_Shopify-interface-does-not-work
shopify interface does not work
2023-07-19 18:13:17 +02:00
Roland Rusch
ab4e9f001e #7 Shopify interface does not work 2023-07-19 17:54:59 +02:00
Roland Rusch
51b70aed0d #7 Shopify interface does not work 2023-07-19 17:54:59 +02:00
Roland Rusch
64241842f6 #7 Shopify interface does not work 2023-07-19 17:54:58 +02:00
Roland Rusch
e6960f0030 #12 Logfile::addLogFile() does not escape the given parameters 2023-07-19 15:31:09 +02:00
Roland Rusch
b02da95c2f #12 Logfile::addLogFile() does not escape the given parameters 2023-07-19 15:18:04 +02:00
Roland Rusch
9994f8c18d #12 Logfile::addLogFile() does not escape the given parameters 2023-07-19 15:14:18 +02:00
OpenXE
2eabd85b91 added message to do db upgrade after install 2023-07-10 19:10:31 +02:00
OpenXE
56e743334a added rechnung_anzahlpapier_abweichend option for adresse 2023-06-26 19:59:25 +02:00
OpenXE
e125a29fa9 bugfix kalender user intern 2023-06-26 09:56:01 +02:00
OpenXE
63a99b1a6e bugfix autoversand print number of invoices according to setting in adresse 2023-06-25 15:32:15 +02:00
OpenXE
1ea3d3a175 bugfix lager seriennummern typo 2023-06-25 15:04:02 +02:00
OpenXE
fcb9b0aeb7 bugfix rechnung mahnwesen minidetail 2023-06-24 10:57:59 +02:00
OpenXE
2b2f84a020 emailbackup_edit minor GUI improvements 2023-06-23 08:42:45 +02:00
OpenXE
265d815534 mahnwesen bugfix delete 2023-06-16 14:09:57 +02:00
OpenXE
174909c178 bugfix mahnwesen status, error on mail 2023-06-16 14:02:58 +02:00
OpenXE
b8cfa9efbb bugfix rechnung rechnung_zahlstatus_berechnen 2023-06-16 12:29:50 +02:00
OpenXE
5da0490260 bugfix mahnwesen neu 2023-06-16 12:20:21 +02:00
OpenXE
9fbd0eb85a mahnwesen added e-mail 2023-06-15 17:26:44 +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
bf10c0d807 bugfix systemhealth db version 2023-06-01 14:15:11 +02:00
OpenXE
d9ff872a98 artikelkategorien & artikelbaum 2023-05-31 17:46:03 +02:00
OpenXE
5ca3a7297b bugfix exportbuchhaltung date of differences 2023-05-24 10:35:56 +02:00
OpenXE
88e1e2ebc2 ticket system show ... ih subject of message is empty 2023-05-23 11:27:47 +02:00
OpenXE
d294daa08b ticket system show embedded cid images in ticket view (insecure view) 2023-05-22 20:51:38 +02:00
OpenXE
2e70e1f2dc bugfix lager lager_bestand menue wrong id 2023-05-21 12:16:54 +02:00
OpenXE
7548c601f5 auftrag refresh PDF and protokoll on teillieferung (teilauftrag) 2023-05-21 11:32:35 +02:00
OpenXE
ac8407faed exportbuchhaltung add ignore / export of differences 2023-05-20 14:15:25 +02:00
OpenXE
011f2915c1 bugfix fibu_buchungen rounding 2023-05-12 12:23:43 +02:00
OpenXE
38cf7c3bc2 ticket system bugfix address with subdomain 2023-05-12 11:59:28 +02:00
OpenXE
209364f8c3 artikel stueckliste added referenz column 2023-05-09 10:33:49 +02:00
OpenXE
fea7a173dc produktion bugfix display of used parts, bugfix produktion list 2023-05-08 17:24:49 +02:00
OpenXE
33d2ca9497 bestellung show wareneingang in minidetail 2023-05-07 19:02:58 +02:00
OpenXE
9002a66085 wareneingang expanded minidetail 2023-05-05 14:46:16 +02:00
OpenXE
c8426bcbc0 wareneingang bugfix bestellung 2023-05-05 14:34:08 +02:00
OpenXE
25cf7de75b wareneingang usability improvements 2023-05-05 14:25:56 +02:00
OpenXE
2d938e96a0 wareneingang added column bestellung 2023-05-05 13:39:03 +02:00
OpenXE
51d7ad7f17 bestellvorschlag bugfix html 2023-05-04 14:15:31 +02:00
OpenXE
f6d71cbbc8 ticket system bugfix sent mails insecure display enabled 2023-05-03 08:45:57 +02:00
OpenXE
1bf58aa8ba ticket system clean tags 2023-05-02 21:05:32 +02:00
OpenXE
63dbedc1a8 report exclude readonly reports as default, added row preview 2023-05-02 18:57:13 +02:00
OpenXE
cd3c0f2113 stueckliste import moved to importvorlage 2023-04-28 16:22:39 +02:00
OpenXE
87a884bd8a Bugfix auftrag vorkasse_ok 2023-04-26 11:10:07 +02:00
OpenXE
62f6df1aeb fibu_buchungen added error when startdate is not set 2023-04-23 17:18:51 +02:00
OpenXE
828c1b1a75 Kontoauszuege removed "new" button. 2023-04-23 16:54:52 +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
1a28b5d75b Prerelease 1.9, added EGPL 2023-04-18 19:14:59 +02:00
OpenXE
50df55e35e bugfix auftrag offene status <> 'storniert' 2023-04-17 13:45:34 +02:00
OpenXE
4720cc8e94 fibu_buchungen einzelzuordnen multifilter 2023-04-15 18:45:09 +02:00
OpenXE
64d6b90312 fibu_buchungen usability improvements 2023-04-15 10:48:47 +02:00
OpenXE
17bdb1c5e1 auftrag set vorkasse_ok according to fibu_buchungen 2023-04-13 21:58:11 +02:00
OpenXE
a43ac720b6 fibu_buchungen single with sachkonto 2023-04-11 19:52:58 +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
667b70eaf5 fibu_buchungen booking to kontorahmen 2023-04-08 17:48:39 +02:00
OpenXE
82fc367405 fibu_buchungen einzelzuordnung 2023-04-06 15:33:53 +02:00
OpenXE
828af9ab50 fibu_buchungen check saldo for vorschlag 2023-04-05 20:38:31 +02:00
OpenXE
e79f2839e2 fibu_objekte_view added sachkonto and is_beleg filter 2023-04-05 12:52:50 +02:00
OpenXE
7aab51a390 fibu_buchungen vorschlag now includes saldo info 2023-04-05 12:32:10 +02:00
OpenXE
3dfba163df fibu_buchungen zuordnen with tablesearch instead of easytable 2023-04-05 11:07:12 +02:00
OpenXE
4a4b1f8320 bugfix import kontoauszuege importfehler 2023-04-05 11:02:06 +02:00
OpenXE
03f0f7217b rechnung & gutschrift set zahlungsstatus according to saldo 2023-04-05 11:01:16 +02:00
OpenXE
c6a4cf0d23 Usability improvement kontoauszuege and buchungen 2023-04-04 14:15:01 +02:00
OpenXE
92f016d06b bugfix kontoauszuege import decimals and sum display 2023-04-04 13:48:40 +02:00
OpenXE
222b0ac239 importvorlage kontoauszuege 2.betrag 2023-04-04 11:59:53 +02:00
OpenXE
1e59009862 gutschrift mark as offen or bezahlt rework 2023-04-04 11:34:07 +02:00
OpenXE
06bc38e66a fibu_buchungen improved cache refresh 2023-04-03 21:17:59 +02:00
OpenXE
ad4599e381 fibu_buchungen_alle converted to cached view for better performance 2023-04-03 20:25:00 +02:00
OpenXE
b1349afb6b fibu_buchungen bugfix search with multiple results 2023-04-03 16:47:44 +02:00
OpenXE
820dc9fec6 kontoauszuege bugfix importer date and filter import errors 2023-04-03 16:23:00 +02:00
OpenXE
46f9e0728d fibu_buchungen add date limit (firmendaten) 2023-04-03 16:10:28 +02:00
OpenXE
ebd50b4f28 fibu_buchungen document auto assign 2023-04-02 12:23:51 +02:00
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