Compare commits

...

758 Commits

Author SHA1 Message Date
felix 4b9bc8754b www/themes/new/templates/loginpage.tpl aktualisiert 2024-03-02 17:13:58 +01:00
felix 980b4d3056 www/themes/new/templates/loginpage.tpl aktualisiert 2024-03-02 17:10:16 +01:00
felix 602bd21f99 www/themes/new/templates/loginpage.tpl aktualisiert 2024-03-02 17:07:46 +01:00
felix 4e8c12b631 Dateien nach "www/themes/new/templates" hochladen 2024-03-02 17:04:28 +01:00
felix aff20577d0 www/themes/new/templates/sidebar_logo.svg gelöscht 2024-03-02 17:04:04 +01:00
felix 212789faa9 Dateien nach "www/themes/new/templates" hochladen 2024-03-02 16:58:49 +01:00
felix 3aba261ba3 www/themes/new/templates/sidebar_logo.svg gelöscht 2024-03-02 16:58:26 +01:00
felix e45e783d39 DBXE Rebranding 2024-03-02 16:55:47 +01:00
felix 962529cbc9 DBXE Rebranding
_old Suffix hinzugefügt
2024-03-02 16:54:55 +01:00
felix 93b1f8d61a upgrade/data/remote.json aktualisiert 2024-03-02 16:33:35 +01:00
felix a05d497774 upgrade/data/remote.json aktualisiert
http -> https
2024-03-02 16:22:01 +01:00
felix 7d4138dd18 DBXE Rebranding 2024-03-02 16:15:07 +01:00
felix d0f53eb1f4 DBXE Rebranding
_old Suffix hinzugefügt
2024-03-02 16:13:48 +01:00
felix d5de8365ee version.php aktualisiert 2024-02-25 11:19:42 +01:00
felix 12cf3f7767 DBXE Rebranding 2024-02-25 11:16:57 +01:00
felix b8f1efbe12 DBXE Rebranding 2024-02-25 11:13:28 +01:00
felix 5a040d69da Update Remote Pfad geändert 2024-02-23 10:29:12 +01:00
felix d69b2fb342 DBXE Rebranding 2024-02-23 10:28:32 +01:00
felix 70b7a63694 DBXE Rebranding 2024-02-23 09:47:00 +01:00
felix 50e232cae7 DBXE Rebranding 2024-02-23 09:46:38 +01:00
felix 0f06a5838d DBXE Rebranding 2024-02-23 09:39:26 +01:00
felix e297ff8669 DBXE Rebranding 2024-02-23 09:39:17 +01:00
felix cffe00216c www/themes/new/templates/sidebar.tpl aktualisiert 2024-02-23 09:38:42 +01:00
felix 051a0805b9 DBXE Rebranding 2024-02-23 09:37:56 +01:00
felix 3d0210dc6d DBXE Rebranding 2024-02-23 09:24:00 +01:00
felix c99958525e DBXE Rebranding 2024-02-23 09:22:59 +01:00
felix 308c2aefa8 DBXE Rebranding 2024-02-23 09:19:52 +01:00
felix 925b8bf56e DBXE Rebranding 2024-02-23 09:19:05 +01:00
felix 5adc7458b2 DBXE Rebranding 2024-02-23 09:15:28 +01:00
felix e7af1e1164 VERSION aktualisiert 2024-02-23 09:14:35 +01:00
felix 29f8fe38ca DBXE Rebranding 2024-02-23 09:13:23 +01:00
felix 0ef8c498a2 DBXE Rebranding 2024-02-23 09:10:19 +01:00
root cf266fb4aa Aenderungen an Loginpage 2024-02-23 08:40:16 +01:00
root 8b8474e6eb Aenderungen an Loginpage 2024-02-23 08:33:15 +01:00
felix 8b43c9c08d www/pages/upgrade.php aktualisiert
Auskommentierung wieder entfernt, da Datenbankupgrade nicht möglich ist und Klick auf "Upgrade" zu Fehlern führt.
2024-02-22 18:38:24 +01:00
felix b39a7e5adb www/pages/upgrade.php aktualisiert 2024-02-21 15:11:52 +01:00
felix 9f633a8fdd Dateien nach "www/themes/new/images" hochladen 2024-02-21 14:15:04 +01:00
felix 4d956f1e38 www/themes/new/images/login_screen_picture.jpg gelöscht 2024-02-21 14:14:31 +01:00
felix ca4825e84e www/themes/new/templates/loginpage.tpl aktualisiert 2024-02-21 13:56:41 +01:00
felix 1b952e3021 www/themes/new/templates/loginpage.tpl aktualisiert 2024-02-21 13:55:31 +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 9d543e6635 database patch for belegvorlagen 2024-02-03 17:54:51 +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 15f4ef55f2 bugfix beleg editable einkaufspreise menu 2024-01-30 15:58:43 +01:00
OpenXE 2b29457763 mailsend bugfix UTF-8 2024-01-30 11:13:07 +01:00
OpenXE 2dcc5b664e export buchhaltung added internet from auftrag, zahlweise 2024-01-25 19:09:53 +01:00
OpenXE e8c7908d29 added einkaufspreise to editable column 2024-01-24 19:10:10 +01:00
OpenXE 63b85f213a angebot deckungsbeitrag 2024-01-24 18:27:34 +01:00
OpenXE f84e7af78a Added database entries for datatablelabels 2024-01-24 13:02:08 +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
OpenXE 08d97478d1 bugfix rechnungslauf 2024-01-22 13:38:21 +01:00
OpenXE 8c1343dff1 cronjobs command.php added stacktrace to logfile 2024-01-22 12:25:15 +01:00
OpenXE a32b79e2a8 ignore www/themes/new/css/custom.css 2024-01-21 13:42:16 +01:00
OpenXE-ERP 00333f8762
Merge pull request #115 from creatronics-de/bugfix_rabatt_in_rechnung_erste_zeile_fehler
Fehler bei Änderung des Rabatts in der ersten Zeile von Angeboten, Rechnungen, etc.
2024-01-21 13:39:32 +01:00
OpenXE ce6ffb0580 bugfix crossselling shopexport 2024-01-21 13:36:58 +01:00
OpenXE e7911e973b added column produkt_ausgehend to shopexport_versandarten 2024-01-21 13:26:17 +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
OpenXE 500e8b5838 verbindlichkeitstatus 'abgeschlossen', refresh status from list, auto-set if everything is ok 2024-01-13 12:18:25 +01:00
OpenXE 2cd60b0bd8 bugfix differenz_auslieferung_tage < 2 2024-01-13 10:35:45 +01:00
OpenXE 3fe8fcd8aa verbindlichkeit added icon attachment missing, change in icons, added filters 2024-01-10 21:03:04 +01:00
OpenXE 63d6f2e7d4 verbindlichkeit bugfix multi action 2024-01-10 14:32:46 +01:00
OpenXE c764a387b4 verbindlichkeit bugfix sort belegnr, empty steuersatz 2024-01-07 10:19:27 +01:00
OpenXE a1affd18d8 wareneingang redesign adding to packet and booking 2024-01-06 19:10:22 +01:00
OpenXE 6c1f40aab9 adresse sachkonto tpl 2024-01-05 19:30:21 +01:00
OpenXE 346ff4cc4a verbindlichkeit bugfix sachkonto / steuer 2024-01-05 19:29:50 +01:00
OpenXE cfbecd780b verbindlichkeit positionen_edit, steuer & sachkonto auf position 2024-01-05 14:09:49 +01:00
OpenXE 3c4a4a8754 verbindlichkeit added usereditid 2024-01-05 11:48:57 +01:00
OpenXE f1a118af6b module_creator bugfix DisableModul 2024-01-05 11:44:45 +01:00
OpenXE 4c14f266e9 verbindlichkeit brutto positionen 2024-01-04 16:09:13 +01:00
OpenXE 3a023592e9 wareneingang datum_abgeschlossen, bearbeiter_abgeschlossen, manuell mit menge 2024-01-04 14:53:21 +01:00
OpenXE 6a6aab4304 verbindlichkeit mass processing, prevent approval without positions, get conditions from address 2024-01-04 13:24:52 +01:00
OpenXE e5393bb7de verbindlichkeit lock control 2024-01-04 10:49:46 +01:00
OpenXE 153c9652ee verbindlichkeit lookup bestellung status versendet added 2024-01-03 15:26:28 +01:00
OpenXE 2e3a7e7b73 verbindlichkeit steuersatz locked after freigabe 2024-01-03 11:23:14 +01:00
OpenXE c582cc1423 verbindlichkeit rundungsdifferenz 2024-01-02 21:21:00 +01:00
OpenXE 580aef2bf6 bugfix bestellung ohne preise PDF 2024-01-02 19:18:27 +01:00
OpenXE 0cde94e672 ticket added javascript confirm for ticketregel 2024-01-02 16:18:18 +01:00
OpenXE c424d79fd6 verbindlichkeit added findcols and filters 2024-01-02 13:21:06 +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
ibs 054bb882da An Angeboten, Rechnungen, etc. lässt sich der Rabatt in der ersten Zeile nicht ändern, der Server liefert einen Fehler 500 weil ein Mysql Query versucht, in der Rechnungstabelle "keinrabatterlaubt" zu setzen.
Der ganze Code ist mir ein Rätsel, ich wüsste nicht, wofür der gut sein könnte. Bei mir funktioniert es ohne diese 3 Zeilen.
2023-12-31 17:32:59 +01:00
OpenXE 0806785d91 verbindlichkeit positionen basic implementation (cosmetics tbd) 2023-12-31 15:00:40 +01:00
OpenXE fe273bb832 wareneingang removed auto set lagerartikel 2023-12-31 14:56:07 +01:00
OpenXE 7029295cb3 adresse added sachkonto for verbindlichkeit 2023-12-30 14:05:16 +01:00
OpenXE 7435a0605b artikel added kontorahmen 2023-12-30 12:49:23 +01:00
OpenXE 39409b0358 artikel readded buchhaltung options 2023-12-29 14:15:34 +01:00
OpenXE 2b95a3891a restored module kostenstellen 2023-12-29 13:44:31 +01:00
OpenXE f7c64bec79 Bugfix Warnung doppelte Seriennummern removed pointless SQL WHERE 2023-12-29 12:58:38 +01:00
OpenXE ae377e452f bugfix GetZahlungsweise empty array 2023-12-29 11:14:28 +01:00
OpenXE 38d0ac4c49 verbindlichkeit mengebetrag 2023-12-27 19:15:42 +01:00
OpenXE b18e8ff444 view fibu_buchungen_alle 2023-12-27 18:40:36 +01:00
OpenXE dc5de062b8 Merge branch 'verbindlichkeit' 2023-12-27 18:19:20 +01:00
OpenXE afd60b382b verbindlichkeit version 1 2023-12-27 18:17:30 +01:00
ibs 302bfee669 alternative Bezeichnung für Rechnungen als Standard per Settings festlegen 2023-12-25 23:28:04 +01:00
OpenXE 8f9ed4d7ae zwischenstand verbindlichkeit filert, multi-action, forms 2023-12-25 21:30:58 +01:00
OpenXE bef8e02217 api_accounts fillApiPermissions if empty 2023-12-15 19:03:16 +01:00
OpenXE-ERP 53b228b06c
Merge pull request #112 from creatronics-de/mysql-fix-quotes
missing quotes added in mysql class
2023-12-15 18:56:15 +01:00
ibs fa9b572e3e missing quotes added 2023-12-15 01:53:52 +01:00
OpenXE 8664e16c55 zwischenstand verbindlichkeit status, forms, positions 2023-12-13 18:27:08 +01:00
OpenXE 57f0e2f627 verbindlichkeit added positionen with sachkonto 2023-12-11 22:17:28 +01:00
OpenXE 042a64589b bugfix fibu_buchungen_alle_view decimal(10,2) instead of double 2023-12-10 13:09:45 +01:00
OpenXE-ERP 8ba116ccf1
Merge pull request #110 from OpenXE-org/exciler_pr
Exciler pr
2023-12-10 10:23:06 +01:00
OpenXE-ERP 33aa53b7c5
Merge pull request #103 from exciler/subscriptioncycle-zahlzyklus
Enable "Zahlzyklus" in "Abolauf"
2023-12-10 10:22:24 +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-ERP 6df9ba2d00
Merge pull request #105 from exciler/prestashop-import-keywords
Prestashop: import keywords and small bugfixes
2023-12-10 10:21:30 +01:00
OpenXE 3bc0eafc51 erpapi bugfix lager_seriennummern 2023-12-09 12:25:29 +01:00
OpenXE 90f38c9496 database added column rabatteportofestschreiben to angebot for shopimport 2023-12-07 20:48:40 +01:00
OpenXE 3c8588562b V.1.11 2023-12-07 16:39:29 +01:00
OpenXE 3e2b5f6ee8 added github link to commits history 2023-12-07 16:29:42 +01:00
OpenXE 7ffb9a86a5 upgrade added strict DB mode 2023-12-07 14:32:02 +01:00
OpenXE 5816dedbc0 lieferschein minor bugfixes 2023-12-05 15:22:11 +01:00
OpenXE 12f5ca8211 logistik ein-auslagern menu change to listview 2023-12-05 11:52:01 +01:00
OpenXE 8b9969176c lieferschein umlagern repeat 2023-12-05 11:47:15 +01:00
OpenXE a6f742ccc0 lieferschein bugfix standardlager 2023-12-05 11:32:53 +01:00
OpenXE 2129627a5b lager lieferschein umlagern 2023-12-02 15:21:11 +01:00
OpenXE bbf8b071c0 Zwischenstand 2023-12-02 15:05:14 +01:00
OpenXE 626c75bbc1 verbindlichkeit initial 2023-11-26 12:46:42 +01:00
OpenXE 22e411a6cc ticketregel bugfix warteschlange 0 2023-11-25 13:13:39 +01:00
OpenXE d7db78489c ticket add spam filter from list 2023-11-25 12:58:16 +01:00
OpenXE 088ad4555c ticketregeln added adresse 2023-11-25 11:24:23 +01:00
OpenXE 2cb1f91a43 ticket system attachments on ticket header 2023-11-19 14:07:16 +01:00
OpenXE dff342276e ticket added "mail to all" 2023-11-19 12:22:44 +01:00
OpenXE c76cb43bac Merge remote-tracking branch 'github/master' 2023-11-14 11:39:21 +01:00
OpenXE 72684cb092 auftrag deckungsbeitrag write einkaufspreis into auftrag_position 2023-11-14 11:38:14 +01:00
OpenXE-ERP 7624e01de4
Merge pull request #108 from OpenXE-org/OpenXE-ERP-patch-1
Update SERVER_INSTALL.md
2023-11-13 15:34:13 +01:00
OpenXE-ERP 9ebd5d2b2b
Update SERVER_INSTALL.md 2023-11-13 15:32:42 +01:00
OpenXE bf3dad7e83 auftrag deckungsbeitrag added umsatz, kosten 2023-11-13 10:21:45 +01:00
OpenXE b7f8c7b359 auftrag format deckungsbeitrag 2 decimals 2023-11-12 13:18:13 +01:00
OpenXE 54fe339c65 auftrag DB % 2 decimals 2023-11-12 12:11:19 +01:00
OpenXE 7d0a5a0eee Auftrag deckungsbeitrag added manual ek and status != abgeschlossen for calculate 2023-11-11 23:12:29 +01:00
OpenXE 7cfb87c2c5 Auftrag deckungsbeitrag implemented 2023-11-11 22:57:32 +01:00
OpenXE 2ae5e9f44a bugfix exportbuchhaltung steuer 2023-11-11 16:37:25 +01:00
OpenXE c106282b13 bugfix copy projekt 2023-11-07 09:57:59 +01:00
OpenXE e737d69a77 bugfix stringcleaner array vs. object 2023-11-07 09:44:44 +01:00
OpenXE 2f646a7715 versand added tracking for mail variables, minor bugfixes 2023-11-02 11:56:05 +01:00
OpenXE-ERP c67d91a7dd
Merge pull request #106 from tsgoff/testmailutf8
test mail utf8_encode
2023-11-02 10:45:42 +01:00
OpenXE 3e69b8d7e0 lieferschein added direct link paketmarke without versandmodul 2023-11-02 09:43:43 +01:00
OpenXE 77092171c3 auftrag show paket and tracking in minidetail 2023-11-01 21:07:05 +01:00
OpenXE a03d28ac69 lieferschein added multi action to set versand_status 2023-11-01 17:34:32 +01:00
OpenXE f55f801cee versandart added button to create versandart without modul 2023-11-01 17:20:54 +01:00
OpenXE 1fe0aea620 versandarten removed check if module is empty 2023-11-01 16:59:48 +01:00
OpenXE e474014b8c versandpakete extended handling of lieferschein_ohne_pos, tracking is editable if no versandmodul 2023-11-01 15:42:21 +01:00
OpenXE 3e70af8466 versandpakete bugfix check completion 2023-11-01 11:48:55 +01:00
OpenXE 662410fdc8 versand process added versand_status to lieferschein and status processing 2023-10-27 15:31:58 +02: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 ecf986d33b versandpakete improvements 2023-10-26 20:23:19 +02:00
OpenXE eb00034a79 versandpakete bugfix 2023-10-25 13:49:27 +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 ca73f3dda5 versandpakete improvements 2023-10-22 18:27:01 +02:00
OpenXE 4488cf8688 versand icons and findcols 2023-10-22 16:02:11 +02:00
OpenXE ec7dc7b8a6 versandpakete update versender on shipping 2023-10-20 15:52:55 +02:00
OpenXE 6e857e6567 delivery icons 2023-10-20 15:48:53 +02:00
OpenXE a35ab21f7c versandpakete improvements 2023-10-20 15:47:37 +02:00
tsgoff f794b4db74
test mail utf8_encode 2023-10-20 15:40:47 +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
OpenXE 5e1359f770 Bugfix ticket_edit betreff width 2023-10-09 19:18:24 +02:00
OpenXE 1bb701322b Wareneingang tabindex mengen 2023-10-07 13:49:26 +02:00
OpenXE 1e55ca1b3d Wareneingang enter press triggers save 2023-10-07 13:36:46 +02:00
OpenXE b34ba86421 Wareineingang bugfix lagerartikel, added some info text 2023-10-06 12:11:17 +02:00
OpenXE b2bf2f14f2 Wareneingang added empty and fill from bestellung 2023-10-04 12:31:02 +02:00
OpenXE bdb05c747a Wareneingang bugfix abschliessen, removed edit from minidetail 2023-10-01 19:48:21 +02:00
OpenXE b613a99791 Wareneingang added link to artikel 2023-10-01 19:33:05 +02:00
OpenXE 1dba7e9d7e Wareneingang save preliminary 2023-10-01 19:19:09 +02:00
OpenXE 60e21956ad class YUI removed <br> from tablesearch 2023-10-01 19:18:28 +02:00
OpenXE 545a39bbdc Wareneingang changed to booking all at once -> TBD: save preliminary, fill, empty 2023-09-30 11:40:59 +02:00
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 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
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 c9aee26df7 removed .woff2 fonts 2023-08-31 10:31:54 +02:00
OpenXE 91c2dc88ba document send preselect default mail address from firmendaten 2023-08-15 12:37:16 +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-ERP ac723e9fda
Merge pull request #92 from RETROTEC-AG/pr/Positions-Menge_wird_immer_auf_1_aufgerundet
positions menge wird immer auf 1 aufgerundet bzw gerundet
2023-08-10 10:31:33 +02:00
OpenXE 5408f197fd improved date format conversion with exception on ticket import with wrongly specified date 2023-08-07 14:57:45 +02:00
OpenXE c0a9156f0e Bugfix MysqlCopyRow NULL values are converted to empty string 2023-08-07 13:12:57 +02:00
Roland Rusch fd0a5a5d4c #8 Positions-Menge wird immer auf 1 aufgerundet 2023-08-04 15:16:05 +02:00
Roland Rusch 1daf876976 #8 Positions-Menge wird immer auf 1 aufgerundet 2023-08-04 15:16:05 +02:00
Roland Rusch 7a29151bdd #8 Positions-Menge wird immer auf 1 aufgerundet 2023-08-04 14:08:31 +02:00
OpenXE 623b041a5f bugfix mustal use correct syntax for BTREE and HASH key types 2023-08-03 14:43:52 +02:00
OpenXE 6242024451 Bugfix ticket system filter for spam 2023-08-03 12:01:23 +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
OpenXE ac0048c788 removed duplicate column in db_schema 2023-07-25 12:00:00 +02:00
OpenXE-ERP f430b7f5ac
Merge pull request #83 from RETROTEC-AG/pr/#9_.htaccess-verbietet-den-Download-der-woff,-woff2-und-js.map-files
.htaccess verbietet den Download der woff, woff2 und js.map files
2023-07-25 11:54:26 +02:00
OpenXE-ERP 83e739d378
Merge pull request #87 from rrusch/missing_$_in_adresse.php
Add missing $
2023-07-25 11:50:42 +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
Roland Rusch 81e2cdb222 #9 .htaccess verbietet den Download der woff, woff2 und js.map files 2023-07-19 21:25:31 +02:00
Roland Rusch 5b49171a74
Update .htaccess 2023-07-19 20:51:31 +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
OpenXE-ERP 322ca715eb
Merge pull request #85 from RETROTEC-AG/feature/#12_Logfile-addLogFile-does-not-escape-the-given-parameters
Logfile::addLogFile() does not escape the given parameters
2023-07-19 18:11:20 +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 08579804a8 #7 Shopify interface does not work 2023-07-19 17:54:58 +02:00
Roland Rusch 64241842f6 #7 Shopify interface does not work 2023-07-19 17:54:58 +02:00
OpenXE-ERP f5c61ca6eb
Merge pull request #81 from RETROTEC-AG/feature/#1_OpenXE-does-not-run-on-Windows
Error Service "SystemConfigModule" was not found when run on windows
2023-07-19 16:47:24 +02:00
OpenXE-ERP aa32bd1276
Merge pull request #84 from RETROTEC-AG/pr/#5_Syntax-error-in-SQL-when-creating-new-address
Syntax error in SQL when creating new address
2023-07-19 16:43:29 +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
Roland Rusch ce5f359a75 #5 Syntax error in SQL when creating new address 2023-07-19 14:58:28 +02:00
Roland Rusch 57e398e7d4 #9 .htaccess verbietet den Download der woff, woff2 und js.map files 2023-07-19 14:43:46 +02:00
Roland Rusch ca5e5c52a1 #1 OpenXE does not run on Windows 2023-07-14 08:53:01 +02:00
Roland Rusch 6f5272717f #1 OpenXE does not run on Windows 2023-07-13 20:24:16 +02:00
OpenXE 2eabd85b91 added message to do db upgrade after install 2023-07-10 19:10:31 +02:00
OpenXE 1be7ba66ee Release 1.10 2023-07-04 11:18:13 +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 53bb9fcdf9 bugfix ticket system warteschlange 2023-06-23 15:54:33 +02:00
OpenXE 2b2f84a020 emailbackup_edit minor GUI improvements 2023-06-23 08:42:45 +02:00
OpenXE f3587501f2 Bugfix ticket system autoresponder 2023-06-23 08:42:28 +02:00
OpenXE 4b40c27c84 bugfix scrolling to middle of page 2023-06-17 12:27:32 +02:00
OpenXE 265d815534 mahnwesen bugfix delete 2023-06-16 14:09:57 +02:00
OpenXE 7c17b2aed9 Merge remote-tracking branch 'github/master' 2023-06-16 14:04:36 +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 06686a6020 removed language selection from login 2023-06-05 14:41:39 +02:00
OpenXE-ERP 1e04647dae
Merge pull request #79 from tsgoff/tooltip
tooltip link
2023-06-05 09:37:19 +02:00
tsgoff 62cca6fe3c
tooltip link 2023-06-04 22:00:20 +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 05699986eb .htaccess added ico and css.map 2023-05-31 14:45:22 +02:00
OpenXE dcedcec0f2 bugfix edit positions getpreise 2023-05-30 13:31:29 +02:00
OpenXE 6fc74f1bf3 bugfix AARLGPositionen removed formatmenge because the javascript screws up numbers above 1000 (decimal point vs thousands) 2023-05-25 17:17:54 +02:00
OpenXE 33b5c1e171 ticket system increased and colored red hidden eye icon 2023-05-25 15:55:57 +02:00
OpenXE 3f7cf88d99 fibu_buchungen added temp tables to db_schema.json 2023-05-24 19:29:43 +02:00
OpenXE 1ebaa24473 .htaccess include robots.txt 2023-05-24 15:44:15 +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 5a4c73d9b8 ticket / mailclient added dump information on mail fetch error 2023-05-23 11:16:16 +02:00
OpenXE d294daa08b ticket system show embedded cid images in ticket view (insecure view) 2023-05-22 20:51:38 +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 60611a2d03 bugfix gutschrift versenden, added column abweichendebezeichnung 2023-05-21 17:27:03 +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 14e727500e projekt added additional option for calculation of brutto 2023-05-15 12:31:17 +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 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 2533e4ca4f bugfix class.yui.php dragndrop positionen 2023-05-04 18:34:17 +02:00
OpenXE a144e2183b class.yui.php refactor count(null) 2023-05-04 16:39:18 +02:00
OpenXE 30ce445ac1 db_schema added explodiert_parent to bestellung_position and rechnung_posistion (seemed to be missing) 2023-05-04 15:51:47 +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 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 3efbcb82d9 db_schema.json changed order of fibu_objekte_view and fibu_buchungen_alle_view 2023-04-24 16:54:30 +02:00
OpenXE f0f468c94e mustal bugfix create table key type 2023-04-24 16:49:34 +02:00
OpenXE b82d17d6f4 Merge branch 'prerelease.1.9' 2023-04-24 16:23:37 +02:00
OpenXE 9db337ce95 release 1.9 2023-04-24 16:23:21 +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 5794301826 fibu_buchungen db_schema changed views, removed gutschrift vs. rechnung, fibu_objekte independent from zahlungsstatus 2023-04-21 14:52:48 +02:00
OpenXE 1a28b5d75b Prerelease 1.9, added EGPL 2023-04-18 19:14:59 +02:00
OpenXE df292c9c02 db_schema.json revert changes from 95d26d5c6e database upgrade to utf8mb4
reverted change from varchar(255) to text for many columns, due to utf8mb4 problems
2023-04-18 11:54:12 +02:00
OpenXE f0a24b7e5b ticket system improved logging on invalid date 2023-04-17 18:21:43 +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 c1d42f6ceb removed fints-hbci, white-cup-filled-by-coffee.jpg 2023-04-12 22:17:57 +02:00
OpenXE c4eaaa966a removed fints-hbci, white-cup-filled-by-coffee.jpg 2023-04-12 22:16:52 +02:00
OpenXE a43ac720b6 fibu_buchungen single with sachkonto 2023-04-11 19:52:58 +02:00
OpenXE 170a33687f fibu_buchungen views fixed empty date on kontorahmen 2023-04-11 16:41:20 +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 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 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 76740aee02 db_schema changed reference in fibu_buchungen_view from fibu_objekte to fibu_objekte_view 2023-04-04 10:59:49 +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 8bdedcb72f Develop version 1.8.1 2023-04-02 17:44:11 +02:00
OpenXE ebd50b4f28 fibu_buchungen document auto assign 2023-04-02 12:23:51 +02:00
OpenXE 85094921a0 bugfix inverted UNIQUE parameter in db_schema and mustal 2023-04-02 11:46:17 +02:00
OpenXE d97f41e293 db_schema adjustments mainly utf8mb3 2023-04-02 10:23:07 +02:00
OpenXE b701a880a4 Merge remote-tracking branch 'github/master' into develop.1.8.1 2023-04-01 22:39:15 +02:00
OpenXE-ERP 7ee2bfae5b
Merge pull request #73 from exciler/sendcloud
Versanddienstleiter improvement
2023-04-01 22:10:10 +02:00
OpenXE 2b573268fa fibu buchungen 2023-04-01 20:42:37 +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 c223e7c956 mustal improvement view handling 2023-03-30 15:21:33 +02:00
OpenXE a15d7b0b41 database utf8 rework 2023-03-30 15:21:09 +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 95d26d5c6e database upgrade to utf8mb4 2023-03-30 11:24:14 +02:00
OpenXE 5bc7a64c8c mustal improvement on collation handling 2023-03-30 11:19:46 +02:00
OpenXE b7153c423c fibu_buchungen added, rework of zahlungen auftrag, rechnung, gutschrift 2023-03-28 12:30:57 +02:00
OpenXE 1637bf965a bugfix mustal default values forced lower case 2023-03-28 12:18:41 +02:00
OpenXE 9a6ed1ae75 fibu_buchungen_alle with type and id of editable item 2023-03-27 16:31:30 +02:00
OpenXE-ERP b6b856fd11
Merge pull request #72 from exciler/sendcloud
Versandarten Bugfixes and stability improvements, some cleanup
2023-03-27 15:42:24 +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 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 62e16cfcc1 fibu_buchungen database definitions 2023-03-25 21:23:20 +01:00
OpenXE 23dc74cd08 Bugfix versandart no module (dummy) 2023-03-25 20:51:16 +01:00
OpenXE 18f2785abd Bugfix typ db_schema 2023-03-25 20:47:08 +01:00
OpenXE 691ad237b5 Merge branch 'develop.1.8' 2023-03-25 20:38:27 +01:00
OpenXE-ERP 71ef13f41d
Merge pull request #70 from exciler/subscriptioncycle
Bugfix SubscriptionCycle: change default handler to "list", fix TableSearch findcols
2023-03-25 20:27:55 +01: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
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 1f52278758 mustal added handling of UNIQUE keys 2023-03-21 20:20:44 +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 d7d4de7a32
Merge pull request #64 from exciler/cpr
add AGPL and EGPL files to LICENSES folder, adopted README/LICENSE
2023-03-13 13:00:22 +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
OpenXE 3f135f6852 Merge branch 'master' into develop.1.8 2023-03-13 12:51:38 +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 75aaf5e2af Module creator improvement layout edit forms 2023-03-12 16:44:14 +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 e2fc1e15e8 lagerzahlen added log information 2023-03-04 14:21:08 +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 cb8b2487d7 module_creator improvement on column headers and findcols 2023-03-02 09:52:36 +01:00
OpenXE 2ffee66e00 Kontenrahmen module restored, also importvorlage for kontenrahmen implemented 2023-03-01 16:27:52 +01:00
OpenXE 37a6fecc36 module creator layout fix 2023-03-01 15:59:17 +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 8b183c88a1 add AGPL and EGPL files to LICENSES folder, adopted README and LICENSE file 2023-02-27 11:17:21 +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-ERP d35a4f41b9
Merge pull request #63 from OpenXE-org/develop.1.8
Update version.php
2023-02-19 12:27:16 +01:00
OpenXE-ERP aae29d6281
Update version.php 2023-02-19 12:25:33 +01:00
OpenXE d846a251ca Angebot added column Bearbeiter 2023-02-17 13:41:04 +01:00
OpenXE c00ae0eb5b Bugfix Firmendaten default entries are not there, thus not editable 2023-02-17 12:22:07 +01:00
OpenXE 05714cfd21 Bugfix Shop LagerSync 2023-02-16 10:56:00 +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 ad3207d67c erpapi FormatMenge default 0 decimal places 2023-02-10 11:08:03 +01:00
OpenXE e0a049608e report bugfix missing data column ftp_passive 2023-02-09 19:09:55 +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
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
OpenXE 3d8c7a13e3 Lager Lagerbestandsberechnung restored 2023-02-04 19:05:22 +01:00
OpenXE 6bb54be5a3 Ticket system rewrite of ticket import attachment handling, now with application/octet-stream and cid 2023-02-02 16:39:00 +01:00
OpenXE 9a45653eaf Ticket system improvement on error handling and logging 2023-02-01 19:02:16 +01:00
OpenXE 9daaf58281 Ticket system attachements exception handling 2023-02-01 16:55:54 +01:00
Andreas Palm d84b20fafe Versandarten: Bugfix shipment_type not transmitted 2023-02-01 15:42:03 +01:00
OpenXE 0eb3ba50f2 Ticket system some fixes where the attachment filename could not be read 2023-02-01 11:24:20 +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 aafcb4130f Versanddienstleister: prefill order number, zolleinzelwert should default to 0 instead of null 2023-01-31 12:12:01 +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 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
OpenXE da0b7d2720 Ticket system bugfix character encoding is now read from parts and used to convert to UTF-8 2023-01-29 19:06:08 +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 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
OpenXE 00dc3414a2 Ticket system bugfix unescaped text in check ticket rule 2023-01-28 16:32:34 +01:00
Andreas Palm 5539c9849c Presta shopimporter 2023-01-28 13:04:28 +01:00
OpenXE-ERP ce11caac12
Merge pull request #54 from tsgoff/patch-1
setup.php php 8.1 deprecation for function_exists(): Passing null to parameter
2023-01-19 10:53:11 +01:00
OpenXE bb3a68042d ticket system ensure status offen on self-assigned tickets 2023-01-19 09:27:23 +01:00
tsgoff f8bfe19f1d
Update setup.php
php 8.1 deprecation for function_exists(): Passing null to parameter
2023-01-18 23:15:24 +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 c006c1c474 bugfix erpapi ANABREGSNeuberechnen 2023-01-04 13:20:23 +01:00
OpenXE 2844c1cc67 ticket system bugfixes for import: escaping, attachments, dateformat 2023-01-04 12:27:34 +01:00
OpenXE 14bf992b2b bugfix ticket system ACL attachements 2023-01-03 14:04:04 +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 93e3b01a25 Ajax loading animation hourglass reactivated 2023-01-01 18:21:44 +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
OpenXE 2acc8aceb9 Bugfix count(0) dokumente 2022-12-28 17:08:19 +01:00
Andreas Palm 5bac7c479c Bugfix date display 2022-12-27 21:38:48 +01:00
Andreas Palm 781fbc2600 Merge remote-tracking branch 'upstream/master' into subscriptioncycle 2022-12-27 21:29:43 +01:00
OpenXE 1f661b9a2b loginpage now with custom.css 2022-12-27 16:35:59 +01:00
OpenXE 45164166f5 Bugfix for bcc in struktur.sql 2022-12-26 13:30:38 +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
OpenXE 71861079e3 ticket system rework for secure import, email stays unread until import is successfull emailbackup_mails will be reverted on error 2022-12-23 17:18:13 +01:00
Andreas Palm 66d248d9e5 Update abgerechnetbis after adding to invoice/order, disable Freigabe during testing 2022-12-23 00:00:59 +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 bb9fd68613 Bugfix auftrag tpl 2022-12-21 10:21:14 +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 0afc12e718 bugfix dokumente zahlungsziel not defined ('' vs. 0) 2022-12-17 13:03:53 +00:00
OpenXE 529587c0f5 Extended .htaccess for setup and inline PDF 2022-12-16 17:45:17 +00:00
OpenXE 35f6532520 Teilauftrag WIP 2022-12-16 17:33:15 +00:00
OpenXE 84eaf1b495 Modified GetPOSTArray and GetGETArray, because keys were not filled in 2022-12-16 14:40:19 +00:00
OpenXE c519d8030a Version 1.7 2022-12-15 11:49:22 +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 6c9d8b7594 upgrade view comparison now ignores view security 2022-12-15 09:46:41 +00:00
OpenXE 51f9929228 upgrade.sh executable bit 2022-12-14 17:44:06 +00:00
OpenXE 508ee0ae8e added userdata to .gitignore 2022-12-14 17:24:17 +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 6a5679ba23 upgrade improved folder handling, git init part 2 2022-12-14 12:38:16 +00:00
OpenXE 724c57d309 upgrade improved folder handling, git init 2022-12-13 18:40:13 +00:00
OpenXE 5ccd0edbb9 refresh githash.txt on login screen, removed cronjob githash.php part 2 2022-12-12 16:16:49 +00:00
OpenXE 0ad4b9600c refresh githash.txt on login screen, removed cronjob githash.php 2022-12-12 13:57:32 +00:00
OpenXE a731d0f5df htaccess warning now not preventing login 2022-12-09 08:54:14 +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 68554f91c1 CheckHtaccess changed from mixed to none to allow php < 8 2022-12-08 15:41:00 +00:00
OpenXE d44fa8ddb0 upgrade added export option, added export, check and creation of VIEWS 2022-12-08 14:01:32 +00:00
OpenXE 7a530e1274 .htaccess security check feature with automatic repair upon login - amended - removed writing to .htaccess 2022-12-08 12:48:49 +00:00
OpenXE e3b7634581 .htaccess security check feature with automatic repair upon login - amended 2022-12-08 11:15:24 +00:00
OpenXE 87e941516e .htacces security check feature with automatic repair upon login 2022-12-07 21:31:26 +00:00
OpenXE e5637b226e upgrade added utf8_bin for utf8_fix 2022-12-06 21:25:51 +01: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 77393c186e mustal utf8fix 2022-12-06 14:43:02 +00:00
OpenXE 8159ae4346 Upgrade added SET SESSION innodb_strict_mode=OFF, for row size too large problem 2022-12-06 12:16:01 +00:00
OpenXE 264bc56365 upgrade improvements regarding error handling and display 2022-12-06 12:13:14 +00:00
OpenXE e4773da6f0 Upgrade from frontend 2022-12-05 22:29:48 +00:00
OpenXE c248cb16fb cronjob githash.php modified to work with ZIP-installed system too 2022-12-04 18:59:10 +00:00
OpenXE 23f390a74f upgrade initialize git repository if there is none 2022-12-03 16:27:00 +00:00
OpenXE 8cc64aee19 bugfix mustal, upgrade remove stash, do reset instead 2022-12-03 15:59:00 +00:00
OpenXE 36501a5013 Mustal upgrade tool & utf8mb3 definition 2022-12-03 15:43:30 +00:00
OpenXE c1c963624d Mustal upgrade tool & utf8mb3 definition 2022-12-03 12:06:01 +00:00
OpenXE a041c6a82c Merge branch 'master' into develop 2022-12-03 11:43:11 +00:00
OpenXE 4815e61883 Upgrade system with git and database upgrade 2022-12-03 11:41:52 +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 a3c253a13b Bugfix when using multidb.conf.php Error when using cronjob # /usr/bin/php8.1 /var/www/html/openxe-v.1.6/cronjobs/starter2.php 2022-12-02 12:22:23 +00:00
OpenXE b5926ee039 Bugfix www/pages/shopimporter_shopware6.php 2022-12-02 12:19:42 +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
OpenXE c443496462 database compare now successfull at updating xentral oss 20.1 to OpenXE 1.6 2022-12-01 20:57:13 +00:00
OpenXE 5d1319b419 database compare key handling WIP 2022-11-30 21:39:24 +00:00
OpenXE d31c7a8961 database compare bugfix keys 2022-11-30 19:17:27 +00:00
OpenXE 1351def3bd database compare with execution WIP 2022-11-30 18:32:10 +01:00
OpenXE cdfb234393 database compare with JSON export 2022-11-29 19:05:19 +00:00
OpenXE 483a002014 database compare removed keys -> will be implemented with SHOW KEYS 2022-11-28 12:08:13 +00:00
OpenXE e25ffdd1f1 database compare remove duplicate SQL statements 2022-11-25 17:03:17 +00:00
OpenXE 84483f0444 database compare create upgrade SQL 2022-11-25 11:53:06 +00:00
OpenXE 1c955a5bca database compare generate SQL WIP 2022-11-24 22:16:50 +00:00
OpenXE 6dad06e07d database compare now looks at table type 2022-11-24 14:18:48 +00:00
OpenXE 9da2e33077 database compare code cleanup with functions 2022-11-24 13:59:49 +00:00
OpenXE 9087f4f01d database compare output improvement 2022-11-24 13:04:13 +00:00
OpenXE e82685d280 database compare optimizations, renamed from export 2022-11-24 12:42:45 +01:00
OpenXE e2869af239 database_compare bugfix if no difference 2022-11-24 12:37:20 +01:00
OpenXE beb004f374 database_compare two-way 2022-11-24 11:23:54 +00:00
OpenXE e6baa612a5 Database tool optimized 2022-11-24 09:21:37 +00:00
OpenXE c641d41219 tool database_export 2022-11-23 14:57:42 +00:00
Andreas Palm c37f0d3847 DHL: First test candidate ;-) 2022-11-22 00:21:57 +01:00
OpenXE 76603076cd Produktion typo bugfix 2022-11-21 11:48:51 +00:00
OpenXE 461b262e16 Release 1.6 2022-11-21 09:33:11 +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
Andreas Palm 8ad45ed723 Basic DHL implementation, Refactor redundant code 2022-11-14 22:29:42 +01: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 c601ac17df Changed permissiondenied page from Xentral to OpenXE 2022-11-10 15:39:24 +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 230d1b03f2 module creator added alignright 2022-11-07 15:54:57 +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 20c64a97ea module_creator with column selection 2022-11-07 10:11:33 +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 e39f56cb24 Produktion Icons sql for angelegt, abgeschlossen, storniert 2022-11-06 11:59:31 +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
OpenXE 13d776750e Produktion WIP reservieren 2022-11-03 12:23:53 +00:00
Andreas Palm d676a1b09a Improve Sendcloud error handling 2022-11-02 22:37:04 +01:00
OpenXE 20e69d9291 Bugfix datei_list 2022-11-01 10:02:10 +00:00
OpenXE 202892b9da Produktion UI minor changes 2022-11-01 09:28:20 +00:00
Andreas Palm 1c7e84d8f2 Versanddienstleister Bugfix 2022-10-30 23:02:42 +01:00
Andreas Palm c5b6f01f9c Remove debug output 2022-10-29 21:41:13 +02:00
Andreas Palm 6a2a16c0a6 Sendcloud bugfixes and improvements 2022-10-29 21:38:28 +02:00
OpenXE d774d9d349 added id field to module_creator inputs, inputs size 20 2022-10-28 10:05:39 +00:00
OpenXE a277250ee0 Produktion UI WIP 2022-10-27 15:55:24 +00:00
Andreas Palm 1ddee4350c Refactor and improve Versandarten settings 2022-10-27 13:17:19 +02:00
Andreas Palm cd93d643f8 Basic Sendcloud integration with Shipment rework 2022-10-26 23:46:38 +02:00
OpenXE f0b1f1731e Merge remote-tracking branch 'github/develop' into develop 2022-10-26 14:13:08 +00:00
OpenXE d5f60e73c1 Produktion edit view with positions 2022-10-26 13:52:50 +00:00
OpenXE-ERP 2b5d01b52a
Merge pull request #25 from 0xAF7/add-gitignore
Add gitignore file
2022-10-26 11:46:54 +02:00
0xAF7 7e73d30805 Add gitignore file 2022-10-25 20:29:30 +02:00
OpenXE feddd00896 Bugfix module creator dropnbox 2022-10-22 12:33:28 +00:00
OpenXE d1991b3f72 Production monitor icons 2022-10-22 12:31:37 +00:00
OpenXE 880f4cbdf1 Produktion list WIP 2022-10-21 20:40:47 +00:00
OpenXE 278d4b631b Produktion initial 2022-10-21 16:12:46 +00:00
OpenXE debe733f13 module_creator expanded now with minidetail and select in list 2022-10-21 16:11:56 +00:00
OpenXE-ERP a243d3b330
Update SERVER_INSTALL.md 2022-10-20 21:46:54 +02:00
OpenXE-ERP bbcb6f5c52
Add files via upload
Optimized login screen picture
2022-10-20 18:21:20 +02:00
Xenomporio 1ce413a763 OpenXE rebranding 2022-10-14 14:22:08 +02:00
OpenXE-ERP 9d6b86b5f9
Add files via upload 2022-10-13 10:16:58 +02:00
OpenXE-ERP ba030de75c
Update README.md 2022-10-13 10:09:11 +02:00
OpenXE-ERP 8684f7d68f
Update README.md 2022-10-13 10:08:28 +02:00
xenomporio bf126c2704
Update README.md 2022-10-11 10:45:33 +02:00
Xenomporio bd10919ea1 Removed www/pages/content/rahmen70red_ohne_form.tpl:w 2022-10-11 10:32:55 +02:00
Xenomporio 7457acbdc1 Merge https://github.com/xenomporio-org/Xenomporio 2022-10-11 10:26:25 +02:00
xenomporio fe08ee7125
Update README.md 2022-10-05 10:56:31 +02:00
Xenomporio 764e19f67b Added sprache to table verbindlichkeit 2022-09-15 15:40:47 +02:00
root 445ba3529c Bugfix in fpdi (external lib) rewrite of function each() 2022-09-13 06:58:13 +00:00
root f625c4b880 Fix compatibility to verbindlichkeit 2022-09-12 15:23:56 +00:00
Xenomporio a78571aa45 1.3.1 2022-09-07 17:16:04 +02:00
Xenomporio f64f6f64cb Bugfix yui autocompletebestellung (was commented out) 2022-09-07 11:42:22 +02:00
Xenomporio af4c64359b Wareneingang also for non stock artikel 2022-09-07 11:41:21 +02:00
root 383524f348 Improved compatibility to Xentral 20 database 2022-09-04 09:57:00 +00:00
Xenomporio 2bb3130b00 Release V.1.3 Readme 2022-08-20 12:20:03 +02:00
Xenomporio d808676489 Bugfix typo 2022-08-20 12:09:07 +02:00
Xenomporio 954eebcdc1 Ticket system bugfixes with filename handling 2022-08-20 11:59:32 +02:00
Xenomporio 84cd447f49 Ticket system cosmetic changes to xentral 20 compatibility assistents 2022-08-19 14:24:13 +02:00
Xenomporio d05cd92b3b ticket system migration helper for ticket date from xentral 20 2022-08-18 21:36:42 +02:00
Xenomporio 3f75bfad7d ticket system migration helper for ticket status from xentral 20 2022-08-18 20:45:09 +02:00
Xenomporio b16b19f2d6 ticket system switched message text display to iframe 2022-08-18 20:41:44 +02:00
Xenomporio c24be3f1c7 ticket system bugfix display of ticket subjects when notiz IS NULL (xentral 20 compatibility) 2022-08-15 23:43:36 +02:00
Xenomporio db1c9cc4ce Ticket system added database compatibility to xentral 20 enterprise ticket system 2022-08-15 18:52:36 +02:00
Xenomporio f3dfd870c2 Bugfix ticket system attachments with UTF-8 URL-encoded filenames 2022-08-14 20:18:15 +02:00
Xenomporio f08c9ecc09 Some changes for file management module dateien 2022-08-12 20:13:15 +02:00
Xenomporio 1e6812dbd4 edit.png -> edit.svg 2022-08-08 16:16:41 +02:00
Xenomporio 29cf035d2e small modifications to welcome.php 2022-08-08 15:52:45 +02:00
Xenomporio 37e100d7ff Bugfix SQL_CALC_FOUND_ROWS for all live tables 2022-08-08 14:06:22 +02:00
Xenomporio 7ff7e6bfd6 Ticket system bugfix received recipients 2022-08-07 12:07:55 +02:00
Xenomporio 17f0efcc68 module creator changed edit icon from png to svg 2022-08-07 11:50:57 +02:00
Xenomporio dfdad1b8c4 Ticket system implemented ticketregeln (ticket rules) 2022-08-07 11:50:13 +02:00
Xenomporio cdaecb3969 Ticket system link from ticket to adresse, changed icon from png to svg 2022-08-06 11:31:43 +02:00
Xenomporio a10933583c Some improvements in adresse CRM 2022-08-06 10:57:29 +02:00
Xenomporio 4c98f6966b CRM new email with prefilled text 2022-08-06 10:41:47 +02:00
Xenomporio 4af7eacfd8 Ticket system / sendmail, changes to response citation and html chars handling 2022-08-06 10:40:58 +02:00
Xenomporio 3c1e7e0949 Bugfix htmlentities in ckeditor e.g. <mail@server> 2022-08-05 21:16:58 +02:00
Xenomporio 18dde9387e Ticket send mail with signature 2022-08-05 19:02:50 +02:00
Xenomporio 6a41075086 Fill out mail adress in new ticket message 2022-08-05 17:19:01 +02:00
Xenomporio a1aa642849 Bugfix incoming tickets select warteschlange and adresse 2022-08-05 17:08:41 +02:00
Xenomporio e1e886e8e6 Ticket system fix display of user edited fields wth htmlentities 2022-08-04 17:58:09 +02:00
Xenomporio b57362ecba Added tickets to CRM view in adresse minidetail 2022-08-04 17:15:11 +02:00
Xenomporio eed70bf673 Bugfix for email address handling in ticket system 2022-08-04 16:50:22 +02:00
Xenomporio fd076040c2 Ticket system default sorting by time 2022-08-03 18:08:32 +02:00
Xenomporio d5a85858bd Ticket System save timestamp on mass edit, new ticket with standard project 2022-08-03 17:43:45 +02:00
Xenomporio 93da199f12 Bugfix ticket system display and handling of recipients 2022-08-03 17:24:28 +02:00
Xenomporio 731f67a9b9 adresse included tickets in crm view 2022-08-02 17:04:58 +02:00
Xenomporio 67bad8d911 Bugfix Ticket System empty cc 2022-08-02 11:50:43 +02:00
Xenomporio 244d30faa9 Bugfix display of open tickets in sidebar 2022-08-01 22:56:28 +02:00
Xenomporio 3238206446 Ticket system rework of the recipients, cc organisation, mail display and more 2022-08-01 22:55:52 +02:00
Xenomporio 6e7e27d289 Ticket system stapelverarbeitung multi processing 2022-07-31 22:32:36 +02:00
Xenomporio 7ca19d7bac Ticket system tag functionality as well as sort/search bugfix 2022-07-31 21:45:38 +02:00
Xenomporio 11f9e7e24e Ticket system filters, notiz adding, time of last action 2022-07-31 18:23:43 +02:00
Xenomporio 3c540cf48a Ticket system minidetail 2022-07-30 14:29:02 +02:00
Xenomporio ecf45792d6 Ticket prio with checkbox and highlight 2022-07-30 13:36:18 +02:00
Xenomporio 7bbcdf206b Ticket system now with drafts and attachement of sent mails 2022-07-30 10:49:47 +02:00
Xenomporio a9c85b0c81 Ticket new message with draft 2022-07-29 14:45:16 +02:00
Xenomporio 11def529a3 Only one RE: when answering tickets 2022-07-27 21:26:59 +02:00
Xenomporio 7efbe5bd0b Changes regarding ticket incoming file attachments 2022-07-27 18:05:24 +02:00
Xenomporio b7f468e62d Added log to einstellungen 2022-07-26 18:38:12 +02:00
Xenomporio b5caed416a Ticket sending works now, attachments tbd 2022-07-26 18:37:54 +02:00
Xenomporio eed061776a Some improvements erpapi mail 2022-07-26 17:35:16 +02:00
Xenomporio a5be988a43 Ticketsystem reading of mails and import
Todo frontend details and sending. Also there is a no timestamp error at import on some mails (error returns e.g.)
2022-07-24 21:11:25 +02:00
Xenomporio 9b9e6d13c5 Storing sent mails to IMAP folder now works 2022-07-23 21:11:01 +02:00
Xenomporio a4449204b5 Ticket module primitive list view 2022-07-22 17:42:03 +02:00
Xenomporio 8a1bfda324 Added IMAP testing function to emailbackup accounts 2022-07-22 17:27:42 +02:00
Xenomporio 881267a00e Sendmail force html, IMAP folder simple implementation but wothout attachments. Also display of new tickets modifed 2022-07-22 17:17:12 +02:00
Xenomporio c6fe8a736b module creator extended to use short table alias 2022-07-22 11:55:58 +02:00
Xenomporio dbf5201c20 Reimplemented module ticket wartschlangen 2022-07-22 11:15:27 +02:00
Xenomporio 910a8544a4 Some frontend adaption for the ticket system 2022-07-22 11:15:15 +02:00
Xenomporio b2610079d6 Importing of tickets from email
Everything needed went into TicketImportHelper, with LegacyDB. Functions taken from TicketService, Gateway and AddressWrapper
2022-07-21 23:44:48 +02:00
Xenomporio 6cbc0bd08e cronjob tickets first version, processing tbd 2022-07-21 17:21:24 +02:00
Xenomporio 68965e87cd Merge branch 'develop' 2022-07-21 11:51:45 +02:00
Xenomporio 89671797a1 changed wareneingang default menu to list 2022-07-20 17:14:08 +02:00
Xenomporio 0ed0cc8bbb Reorganised wareneingang and lager menu 2022-07-20 16:51:41 +02:00
Xenomporio e9e292c2e2 wareneingang some sorting renaming of files 2022-07-20 16:45:00 +02:00
Xenomporio bd556796e2 Bugfix wareneingang, additional columns renr & lsnr 2022-07-20 13:45:22 +02:00
Xenomporio ba1157dbfc Removed select from steuerregelngruppe, table does not exist 2022-07-20 12:29:51 +02:00
Xenomporio e3e9e52ff5 Many modifications to wareneingang and paketdistribution 2022-07-20 12:27:12 +02:00
Xenomporio 70e3289df5 Merge branch 'develop' 2022-07-19 17:20:14 +02:00
Xenomporio b27b5d155e Small changes versandzentrum 2022-07-19 17:15:51 +02:00
Xenomporio 3b03a9e684 Deactivated 2 step commissioning in frontend 2022-07-19 10:33:56 +02:00
Xenomporio 49c912cb45 Auftragversand -> Send mail after printing 2022-07-19 10:33:27 +02:00
Xenomporio 5b6062f9be Show number of order auftrag drafts in bearbeitung 2022-07-19 10:16:06 +02:00
Xenomporio d9240e184d Autoversand_manuell cronjob now able to send orders with delivery date in the future, if selected by user 2022-07-18 20:27:17 +02:00
Xenomporio fc64ced7ea Bugfix versandzentrum ajax filters 2022-07-18 20:05:47 +02:00
Xenomporio 99bbbdca42 Bugfix in IMAP put mail into sentfolder 2022-07-17 23:25:34 +02:00
Xenomporio 02bf9af08e Implemented cronjob order processing (manual)
orders have to be marked in the versandzentrum beforehand
2022-07-17 12:50:52 +02:00
Xenomporio bb3e18d7b4 Added auftrag versandzentrum order queue warteschlange
-> Cronjob processing tbd
2022-07-16 19:29:37 +02:00
Xenomporio 032b03a6c9 Removed order process options in project settings. -> cronjob processing as well as two step process is not implemented and missing in the sources (kommissionierlauf.php) 2022-07-15 10:36:38 +02:00
Xenomporio ee4f7ab88a changed abkuerzung in projekt to varchar(128) because of index 2022-07-14 20:57:50 +02:00
Xenomporio 989974d556 versandzentrum fast lane display harmonised 2022-07-14 20:43:40 +02:00
Xenomporio 6ff92c0900 Fixed versandzentrum filters 2022-07-14 18:23:57 +02:00
Xenomporio b52354b1ad Automatic order processing manually
Cronjob based not working yes. Expanded process options in project settings.
2022-07-14 14:06:30 +02:00
Xenomporio 90de642685 Minor bugfix for emailaccount testmail 2022-07-13 11:23:38 +02:00
Xenomporio b14c419f3f removed.upgrade.host 2022-07-13 10:45:03 +02:00
Xenomporio eff711a539 Minidetail versandzentrum added 2022-07-12 17:23:02 +02:00
Xenomporio ff7f9160e4 Bugfix auto increment of document IDs 2022-07-12 11:33:14 +02:00
Xenomporio 3ef58b681f Bugfix auto increment of document IDs 2022-07-11 21:57:48 +02:00
Xenomporio 2a5f01004b Fixed autoversand 2022-07-11 17:49:59 +02:00
xenomporio b618ea78d4
Update README.md 2022-07-08 14:31:19 +02:00
xenomporio 161e6ea929
Update SERVER_INSTALL.md 2022-07-08 14:30:42 +02:00
xenomporio 9eb590f7ba
Update SERVER_INSTALL.md 2022-07-08 14:27:37 +02:00
xenomporio c4e0494417
Update INSTALL.md 2022-07-08 14:21:53 +02:00
xenomporio c15fa08427
Add files via upload 2022-07-08 14:21:32 +02:00
xenomporio d937436f9e
Add files via upload 2022-07-08 14:17:59 +02:00
xenomporio 8e4b58b7cc
Update INSTALL.md 2022-07-08 14:17:20 +02:00
xenomporio d0ebab936a
Add files via upload 2022-07-08 14:07:19 +02:00
xenomporio ba9307f01c
Create stub 2022-07-08 14:06:51 +02:00
xenomporio 298b88331b
Update SERVER_INSTALL.md 2022-07-08 11:42:06 +02:00
xenomporio e7f01f7e10
Update SERVER_INSTALL.md 2022-07-08 11:41:47 +02:00
xenomporio ffd58bb196
Update INSTALL.md 2022-07-08 11:40:09 +02:00
xenomporio 0b5fa939d5
Update SERVER_INSTALL.md 2022-07-08 10:59:14 +02:00
xenomporio 758328a8ef
Create SERVER_INSTALL.md 2022-07-08 10:45:25 +02:00
528 changed files with 221186 additions and 110058 deletions

5
.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
conf/user.inc.php
conf/user_defined.php
userdata
www/cache/
www/themes/new/css/custom.css

19
.htaccess Normal file
View File

@ -0,0 +1,19 @@
# Generated file from class.acl.php
# For detection of htaccess functionality
SetEnv OPENXE_HTACCESS on
# Disable directory browsing
Options -Indexes
# Set default page to index.php
DirectoryIndex "index.php"
# Deny general access
Order deny,allow
<FilesMatch ".">
Order Allow,Deny
Deny from all
</FilesMatch>
# Allow index.php
<Files "index.php">
Order Allow,Deny
Allow from all
</Files>
# end

3
.reuse/dep5 Normal file
View File

@ -0,0 +1,3 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: OpenXE
Source: https://openxe.org

View File

@ -1,10 +1,27 @@
# Xentral Installation
# OpenXE installation
1. aktuelle .tar.gz entpacken in einem Ordner
2. per Browser auf auf Verzeichnis gehen
3. setup durchfuehren (trotz Hinweis der Rechte (diese muessen passen) weiter klicken)
4. Der Webserver-Pfad sollte dringend auf www gesetzte werden, sodass die
Firmen kritischen Dateien auf keinen Fall durch eine fehlerhafte .htaccess
Datei jemals online stehen (es geht primaer um den Ordner userdata und conf).
## Place the installation files into a folder in /var/www/html/.
`cd /var/www/html`
e.g. Release 1.0:
`sudo wget https://github.com/openxe-org/OpenXE/archive/refs/tags/V.1.0.zip`
`unzip V.1.0.zip`
## Set folder permissions:
`sudo chown www-data:www-data OpenXE-V.1.0 -R`
## Fire up the setup page in a browser
http://yourserverip/OpenXE-V.1.0 (watch out, its case sensitive)
<img src="doc/Install-10.png" width="800px">
<img src="doc/Install-20.png" width="800px">
<img src="doc/Install-30.png" width="800px">
<img src="doc/Install-40.png" width="800px">
<img src="doc/Install-50.png" width="800px">
<img src="doc/Install-60.png" width="800px">
<img src="doc/Install-done.png" width="800px">

View File

@ -1,654 +1,5 @@
GNU Affero General Public License
=================================
_Version 3, 19 November 2007_
_Copyright © 2007 Free Software Foundation, Inc. &lt;<http://fsf.org/>&gt;_
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
## Preamble
The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
Developers that use our General Public Licenses protect your rights
with two steps: **(1)** assert copyright on the software, and **(2)** offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing under
this license.
The precise terms and conditions for copying, distribution and
modification follow.
## TERMS AND CONDITIONS
### 0. Definitions
“This License” refers to version 3 of the GNU Affero General Public License.
“Copyright” also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
“The Program” refers to any copyrightable work licensed under this
License. Each licensee is addressed as “you”. “Licensees” and
“recipients” may be individuals or organizations.
To “modify” a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a “modified version” of the
earlier work or a work “based on” the earlier work.
A “covered work” means either the unmodified Program or a work based
on the Program.
To “propagate” a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To “convey” a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays “Appropriate Legal Notices”
to the extent that it includes a convenient and prominently visible
feature that **(1)** displays an appropriate copyright notice, and **(2)**
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
### 1. Source Code
The “source code” for a work means the preferred form of the work
for making modifications to it. “Object code” means any non-source
form of a work.
A “Standard Interface” means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The “System Libraries” of an executable work include anything, other
than the work as a whole, that **(a)** is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and **(b)** serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
“Major Component”, in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The “Corresponding Source” for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
### 2. Basic Permissions
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
### 3. Protecting Users' Legal Rights From Anti-Circumvention Law
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
### 4. Conveying Verbatim Copies
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
### 5. Conveying Modified Source Versions
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
* **a)** The work must carry prominent notices stating that you modified
it, and giving a relevant date.
* **b)** The work must carry prominent notices stating that it is
released under this License and any conditions added under section 7.
This requirement modifies the requirement in section 4 to
“keep intact all notices”.
* **c)** You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
* **d)** If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
“aggregate” if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
### 6. Conveying Non-Source Forms
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
* **a)** Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
* **b)** Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either **(1)** a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or **(2)** access to copy the
Corresponding Source from a network server at no charge.
* **c)** Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
* **d)** Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
* **e)** Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A “User Product” is either **(1)** a “consumer product”, which means any
tangible personal property which is normally used for personal, family,
or household purposes, or **(2)** anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, “normally used” refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
“Installation Information” for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
### 7. Additional Terms
“Additional permissions” are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
* **a)** Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
* **b)** Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
* **c)** Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
* **d)** Limiting the use for publicity purposes of names of licensors or
authors of the material; or
* **e)** Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
* **f)** Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered “further
restrictions” within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
### 8. Termination
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated **(a)**
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and **(b)** permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
### 9. Acceptance Not Required for Having Copies
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
### 10. Automatic Licensing of Downstream Recipients
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An “entity transaction” is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
### 11. Patents
A “contributor” is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's “contributor version”.
A contributor's “essential patent claims” are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, “control” includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a “patent license” is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To “grant” such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either **(1)** cause the Corresponding Source to be so
available, or **(2)** arrange to deprive yourself of the benefit of the
patent license for this particular work, or **(3)** arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. “Knowingly relying” means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is “discriminatory” if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license **(a)** in connection with copies of the covered work
conveyed by you (or copies made from those copies), or **(b)** primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
### 12. No Surrender of Others' Freedom
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
### 13. Remote Network Interaction; Use with the GNU General Public License
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
### 14. Revised Versions of this License
The Free Software Foundation may publish revised and/or new versions of
the GNU Affero General Public License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU Affero General
Public License “or any later version” applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU Affero General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
### 15. Disclaimer of Warranty
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
### 16. Limitation of Liability
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
### 17. Interpretation of Sections 15 and 16
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
_END OF TERMS AND CONDITIONS_
## How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the “copyright” line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a “Source” link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a “copyright disclaimer” for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
&lt;<http://www.gnu.org/licenses/>&gt;.
# THE CONTENT OF THIS FILE HAS BEEN MOVED TO THE [LICENSES](LICENSES) SUBFOLDER
# SEE [README](README.md) AND [LICENSES](LICENSES) FOLDER FOR MORE INFORMATION
## Plugins/Bibliotheken
@ -706,4 +57,4 @@ For more information on this, and how to apply and follow the GNU AGPL, see
moxiecode.com
Flot
http://code.google.com/p/flot/
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

660
LICENSES/AGPL-3.0-only.md Normal file
View File

@ -0,0 +1,660 @@
### GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
Copyright (C) 2007 Free Software Foundation, Inc.
<https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
### Preamble
The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains
free software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing
under this license.
The precise terms and conditions for copying, distribution and
modification follow.
### TERMS AND CONDITIONS
#### 0. Definitions.
"This License" refers to version 3 of the GNU Affero General Public
License.
"Copyright" also means copyright-like laws that apply to other kinds
of works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of
an exact copy. The resulting work is called a "modified version" of
the earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user
through a computer network, with no transfer of a copy, is not
conveying.
An interactive user interface displays "Appropriate Legal Notices" to
the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
#### 1. Source Code.
The "source code" for a work means the preferred form of the work for
making modifications to it. "Object code" means any non-source form of
a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users can
regenerate automatically from other parts of the Corresponding Source.
The Corresponding Source for a work in source code form is that same
work.
#### 2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not convey,
without conditions so long as your license otherwise remains in force.
You may convey covered works to others for the sole purpose of having
them make modifications exclusively for you, or provide you with
facilities for running those works, provided that you comply with the
terms of this License in conveying all material for which you do not
control copyright. Those thus making or running the covered works for
you must do so exclusively on your behalf, under your direction and
control, on terms that prohibit them from making any copies of your
copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under the
conditions stated below. Sublicensing is not allowed; section 10 makes
it unnecessary.
#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such
circumvention is effected by exercising rights under this License with
respect to the covered work, and you disclaim any intention to limit
operation or modification of the work as a means of enforcing, against
the work's users, your or third parties' legal rights to forbid
circumvention of technological measures.
#### 4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
#### 5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these
conditions:
- a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
- b) The work must carry prominent notices stating that it is
released under this License and any conditions added under
section 7. This requirement modifies the requirement in section 4
to "keep intact all notices".
- c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
- d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
#### 6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms of
sections 4 and 5, provided that you also convey the machine-readable
Corresponding Source under the terms of this License, in one of these
ways:
- a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
- b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the Corresponding
Source from a network server at no charge.
- c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
- d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
- e) Convey the object code using peer-to-peer transmission,
provided you inform other peers where the object code and
Corresponding Source of the work are being offered to the general
public at no charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal,
family, or household purposes, or (2) anything designed or sold for
incorporation into a dwelling. In determining whether a product is a
consumer product, doubtful cases shall be resolved in favor of
coverage. For a particular product received by a particular user,
"normally used" refers to a typical or common use of that class of
product, regardless of the status of the particular user or of the way
in which the particular user actually uses, or expects or is expected
to use, the product. A product is a consumer product regardless of
whether the product has substantial commercial, industrial or
non-consumer uses, unless such uses represent the only significant
mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to
install and execute modified versions of a covered work in that User
Product from a modified version of its Corresponding Source. The
information must suffice to ensure that the continued functioning of
the modified object code is in no case prevented or interfered with
solely because modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or
updates for a work that has been modified or installed by the
recipient, or for the User Product in which it has been modified or
installed. Access to a network may be denied when the modification
itself materially and adversely affects the operation of the network
or violates the rules and protocols for communication across the
network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
#### 7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders
of that material) supplement the terms of this License with terms:
- a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
- b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
- c) Prohibiting misrepresentation of the origin of that material,
or requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
- d) Limiting the use for publicity purposes of names of licensors
or authors of the material; or
- e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
- f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions
of it) with contractual assumptions of liability to the recipient,
for any liability that these contractual assumptions directly
impose on those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions; the
above requirements apply either way.
#### 8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your license
from a particular copyright holder is reinstated (a) provisionally,
unless and until the copyright holder explicitly and finally
terminates your license, and (b) permanently, if the copyright holder
fails to notify you of the violation by some reasonable means prior to
60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
#### 9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or run
a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
#### 10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
#### 11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims owned
or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within the
scope of its coverage, prohibits the exercise of, or is conditioned on
the non-exercise of one or more of the rights that are specifically
granted under this License. You may not convey a covered work if you
are a party to an arrangement with a third party that is in the
business of distributing software, under which you make payment to the
third party based on the extent of your activity of conveying the
work, and under which the third party grants, to any of the parties
who would receive the covered work from you, a discriminatory patent
license (a) in connection with copies of the covered work conveyed by
you (or copies made from those copies), or (b) primarily for and in
connection with specific products or compilations that contain the
covered work, unless you entered into that arrangement, or that patent
license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
#### 12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under
this License and any other pertinent obligations, then as a
consequence you may not convey it at all. For example, if you agree to
terms that obligate you to collect a royalty for further conveying
from those to whom you convey the Program, the only way you could
satisfy both those terms and this License would be to refrain entirely
from conveying the Program.
#### 13. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your
version supports such interaction) an opportunity to receive the
Corresponding Source of your version by providing access to the
Corresponding Source from a network server at no charge, through some
standard or customary means of facilitating copying of software. This
Corresponding Source shall include the Corresponding Source for any
work covered by version 3 of the GNU General Public License that is
incorporated pursuant to the following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
#### 14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Affero General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU Affero General Public License, you may choose any version ever
published by the Free Software Foundation.
If the Program specifies that a proxy can decide which future versions
of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
#### 15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
CORRECTION.
#### 16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
#### 17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
### How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these
terms.
To do so, attach the following notices to the program. It is safest to
attach them to the start of each source file to most effectively state
the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper
mail.
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for
the specific requirements.
You should also get your employer (if you work as a programmer) or
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. For more information on this, and how to apply and follow
the GNU AGPL, see <https://www.gnu.org/licenses/>.

View File

@ -0,0 +1,69 @@
# EMBEDDED PROJECTS GENERAL PUBLIC LICENSE Version 3.1
EGPLv3.1
Copyright (C) 2015 embedded projects GmbH, Augsburg, Germany
## Preamble
The EGPLv3.1 incorporates the terms of the GNU AFFERO GENERAL PUBLIC LICENSE Version 3, dated 19 November 2007 (AGPLv3) as shown under EXHIBIT A *and* the following terms, WHEREAS the following terms
- extend, amend and/or clarify the AGPLv3 and
- prevail in case of any contradictions with the AGPLv3.
The following terms of the EGPLv3.1 may not be separated from the terms of the AGPLv3 in EXHIBIT A together they form the EGPLv3.1.
It is purpose of the EGPLv3.1 to make any user and/or recipient of this file or its content aware of the identity of the copyright holder/licensor and its business.
## DEVELOPER & DISTRIBUTOR NOTES:
- For purpose of clarification, the following terms have priority over the terms of the AGPLv3, especially No. 7 of the AGPLv3. This however, may render the EGPLv3.1 incompatible with any other AGPLv3s or any other GPL.
- Inasmuch as embedded projects GmbH is the licensor, embedded projects reserves the right to publish guidelines for the interpretation of the EGPLv3.1 on http://www.wawision.de which are incorporated into this license by reference in case they are published prior to your obtainment of the EGPLv3.1. You bear the burden of proof that you obtained this license prior to the publishment of a certain guideline.
## 0. Definition of the program
The Program hereinafeter (and pursuant to No. 0 AGPLv3) includes but is not limited to any file or portion of it that
- a) references to the EGPLv3.1 including but not limited to such references from source code header files
OR
- b) is referenced to the EGPLv3.1 by
- (i) any documentation provided with the file OR
- (ii) a notice file that is contained in the same directory in which the file is stored. In the absence of such notice file in the same directory, said notice file can be found in the upper directory that is next to the file which would be the root directory as a last resort.
The use of this file and its content (including but not limited to all modules, databases, pictorial images and documentation and all forms of computer program codes and parts thereof) are subject to the EGPLv3.1.
## 1. Adevertising Clauses
- a) All advertising materials for (i) any work that contains this file, its content and/or any portion of it or (ii) mentioning features and/or use of this file, its content and/or any portion of it must mention at least ONE of the following statements:
> “Diese Software ist eine Ableitung und Veränderung von WaWision ERP. WaWision ERP wurde von embedded projects GmbH entwickelt und steht unter der EGPLv3.1-Lizenz als Open Source Software. Informationen zu WaWision und der Open-Source Version findet man unter http://www.wawision.de.”
AND/OR
> “This Software is a derivative and modification of WaWision ERP. WaWision ERP was developed by embedded projects GmbH und is licensed under the EGPLv3.1 license as Open Source Software. Information on WaWision and its open source distribution can be obtained from http://www.wawision.”
- b) The statement under clause 1 a) has to be displayed in black latin font (“Arial” or “Times New Roman”) on white background with font size of at least 12pt.
- c) The “advertising materials” under clause 1 a) comprises all non-verbal forms of advertising and business in theprogram, including but not limited to digital or printed offers or displays (e.g. on convention displays, brochures, websites or webshops) or terms and conditions for the distribution or cloud/SaaS use of the program.
- d) You are required to provide customers and/or any recipients of your advertising materials with the text of the complete EGPLv3.1 text upon request. You may not charge any fee for the provision of the EGPLv3.1 text, when you are requested to provide the EGPLv3.1 by means of electronic communication (e.g. e-mail).
## 2. Integrity of Copyright and License Notices
You are not allowed to remove or modify any copyright and license notices from the program unless you only add your own copyright notice exclusively for your own contributions.
## 3. Network Interaction
- a) A user interaction with the program pursuant to No. 13 AGPLv3 includes but is not limited to situations in which the user receives parts of the program on a client machine during interaction with a server. For the purpose of clarification,
- i) said user interaction does not necessarily mean access to all functions of the program in order to interact with it. Said interaction comprises but is not limited to any code of the program that is purposefully cached on the users machine for preparing code execution and any login dialog of the program no matter whether the user has the suitable login information.
- ii) the term user means anyone but the licensee, i.e. comprising but not limited to employees of the licensee.
- b) Instead of providing the user that interacts with the program pursuant to No. 13 AGPLv3 with the source code of the original program, you are obliged to offer the complete corresponding code of the licensees covered work for internet download to the PUBLIC under the EGPLv3.1, including but not limited to No. 5 AGPLv3. The aforementioned offer has to be prominently positioned
## 4. Defintion of a Work Based on the Program
A work based on the program includes but is not limited to
- a) any new arrangement of the program with other new files, e.g. libraries without regard to the form of linking (dynamic or static) AND
- b) any other new module that contains portions of the program, e.g. any code fragment of the program. In case, the aforementioned incorporation of a code fragment into a new module does not require the permission by the licensor, said module must be licensed under the EGPLv3.1 when the module is conveyed together with the program.
## 5. No Trademark or Name Rights
Notwithstanding No. 1 and 5 EGPLv3.1, nothing in the EGPLv3.1 grants you the to right to use the trademark WaWision or the name of the embedded projects GmbH.
## 6. Integrity of the EGPLv3.1
The EGPLv3.1 may not be changed, including but not limited for the distribution of the program or any work based on the program; No. 14 AGPLv3 does not apply.
## 7. Choice of Law, Jurisdiction
The EGPLv3.1 is governed by the laws of Germany whereas the application of the International Convention of the Sale of Goods (CISG) is excluded. Inasmuch as you are a merchant pursuant to Sec. 13 German Civil Code (BGB), all courts in Germany shall have jurisdiction for any dispute arising from the EGPLv3.1.
# EXHIBIT A
## GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
-> See [AGPL-3.0-only.md](AGPL-3.0-only.md)

View File

@ -1,8 +1,8 @@
# Xenomporio - The free ERP
# OpenXE - The free ERP
![Xenomporio overview](https://github.com/xenomporio-org/Xenomporio/blob/master/www/themes/new/images/login_screen_picture.jpg "Xenomporio")
![OpenXE overview](https://github.com/openxe-org/OpenXE/blob/master/www/themes/new/images/login_screen_picture.jpg "OpenXE")
Xenomporio ist eine umfassende webbasierte Anwendung zur Abwicklung aller kaufmännischen Prozesse. Zu den Funktionen gehören unter Anderem:
OpenXE ist eine umfassende webbasierte Anwendung zur Abwicklung aller kaufmännischen Prozesse. Zu den Funktionen gehören unter Anderem:
* Erstellung von Angeboten
* Auftragsabwicklung
@ -13,4 +13,29 @@ Xenomporio ist eine umfassende webbasierte Anwendung zur Abwicklung aller kaufm
* Aufgaben- und Terminverwaltung
* Zeitabrechnung
Xenomporio ist freie Software, lizensiert unter AGPL 3 und basiert auf der Open Source Version von Xentral https://xentral.com/
# Neue Community-Seite: https://openxe.org/
An alle Interessenten:
Dieses Projekt startet mit einer leistungsfähigen Software, aber gerade am Anfang ist es schwierig, die potenziellen Anwender abzuschätzen. Das ist jedoch eine wichtige Information und auch Motivation für alle, die sich aktiv am Projekt beteiligen. Wir bitten daher, alle Interessenten für OpenXE, sich hier anzumelden. Die Anmeldung ist kostenfrei und mit keinerlei Verpflichtungen versehen. Ausserdem habt Ihr den Vorteil, Euch bei Fragen direkt im Communitybereich zu melden oder selber aktiv mitzugestalten.
Wir freuen uns über Eure Teilnahme, egal ob als stiller Mitleser oder aktiver User.
# Letzte Änderungen: Ticket System
Neu in [V.1.3](https://github.com/openxe-org/OpenXE/releases/tag/V.1.3):
Neuimplementierung des Xentral 20 Enterprise Ticketsystems mit vielen Verbesserungen, z.B.:
- Anhänge werden auch bei ausgehenden Nachrichten gespeichert
- Verbesserte Kommentarfunktion
- Unterstützung mehrerer Empfänger und CC
- Verbesserte Stapelverarbeitung
# Installation
[Hier gehts zur Server Installation](SERVER_INSTALL.md)
[Hier gehts zur OpenXE Installation](INSTALL.md)
OpenXE ist freie Software, lizensiert unter der EGPL 3.1.
Diese Software ist eine Ableitung und Veränderung von WaWision ERP. WaWision ERP wurde von embedded projects GmbH entwickelt und steht unter der EGPLv3.1-Lizenz als Open Source Software. Informationen zu WaWision und der Open-Source Version findet man unter http://www.wawision.de

185
SERVER_INSTALL.md Normal file
View File

@ -0,0 +1,185 @@
# Server Install (Example for ubuntu-22.04-live-server-amd64.iso)
## Create new server instance
e.g. 8 GB RAM, 128 GB hard drive, 4 CPUs.
## Install the operating system
(...)
It is recommended install OpenSSH during install.
## Refresh the update system
`sudo apt-get update`
## Install the webserver
`sudo apt-get install apache2`
-> Test the webserver (http://IP_ADDRESS)
It should show the "Apache2 Default Page".
## Install PHP (8.1)
`sudo apt-get install php libapache2-mod-php`
`php -v` should output:
```PHP 8.1.2 (cli) (built: Jun 13 2022 13:52:54) (NTS)
Copyright (c) The PHP Group
Zend Engine v4.1.2, Copyright (c) Zend Technologies
with Zend OPcache v8.1.2, Copyright (c), by Zend Technologies
```
## Install PHP modules
`sudo apt-get install php-mysql php-cli php-imap php-curl php-xml php-soap php-zip php-mbstring php-gd`
## Configure PHP
Add the following lines to `/etc/php/8.1/apache2/php.ini` and `/etc/php/8.1/cli/php.ini`:
```
disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,dl,highlight_file,show_source,proc_open,popen
post_max_size = 100M
upload_max_filesize = 100M
max_execution_time = 3600
max_input_time = 3600
magic_quotes_gpc = Off
file_uploads = Yes
max_file_uploads = 20
short_open_tag = On
max_input_vars=3000
memory_limit = 256M
```
## Install additional zip
`sudo apt-get install zip`
## Install database server
`sudo apt-get install mariadb-server`
## Configure database server
`sudo mariadb-secure-installation`
```
NOTE: RUNNING ALL PARTS OF THIS SCRIPT IS RECOMMENDED FOR ALL MariaDB
SERVERS IN PRODUCTION USE! PLEASE READ EACH STEP CAREFULLY!
In order to log into MariaDB to secure it, we'll need the current
password for the root user. If you've just installed MariaDB, and
haven't set the root password yet, you should just press enter here.
Enter current password for root (enter for none):
OK, successfully used password, moving on...
Setting the root password or using the unix_socket ensures that nobody
can log into the MariaDB root user without the proper authorisation.
You already have your root account protected, so you can safely answer 'n'.
Switch to unix_socket authentication [Y/n] n
... skipping.
You already have your root account protected, so you can safely answer 'n'.
Change the root password? [Y/n] y
New password:
Re-enter new password:
Password updated successfully!
Reloading privilege tables..
... Success!
By default, a MariaDB installation has an anonymous user, allowing anyone
to log into MariaDB without having to have a user account created for
them. This is intended only for testing, and to make the installation
go a bit smoother. You should remove them before moving into a
production environment.
Remove anonymous users? [Y/n] y
... Success!
Normally, root should only be allowed to connect from 'localhost'. This
ensures that someone cannot guess at the root password from the network.
Disallow root login remotely? [Y/n] y
... Success!
By default, MariaDB comes with a database named 'test' that anyone can
access. This is also intended only for testing, and should be removed
before moving into a production environment.
Remove test database and access to it? [Y/n] y
- Dropping test database...
... Success!
- Removing privileges on test database...
... Success!
Reloading the privilege tables will ensure that all changes made so far
will take effect immediately.
Reload privilege tables now? [Y/n] y
... Success!
Cleaning up...
All done! If you've completed all of the above steps, your MariaDB
installation should now be secure.
Thanks for using MariaDB!
```
## Create database for openxe
`mysql -u root -p`
```
Welcome to the MariaDB monitor. Commands end with ; or \g.
Your MariaDB connection id is 41
Server version: 10.6.7-MariaDB-2ubuntu1 Ubuntu 22.04
Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others.
Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
MariaDB [(none)]> CREATE DATABASE openxe;
Query OK, 1 row affected (0.001 sec)
MariaDB [(none)]> CREATE USER 'openxe'@'localhost' IDENTIFIED BY 'enteryourpasswordhere';
Query OK, 0 rows affected (0.015 sec)
MariaDB [(none)]> GRANT ALL PRIVILEGES ON openxe.* TO 'openxe'@'localhost' WITH GRANT OPTION;
Query OK, 0 rows affected (0.012 sec)
MariaDB [(none)]> FLUSH PRIVILEGES;
Query OK, 0 rows affected (0.002 sec)
MariaDB [(none)]> quit
Bye
```
You can test your database like this:
`mysql -u openxe -p`
```
Enter password:
Welcome to the MariaDB monitor. Commands end with ; or \g.
Your MariaDB connection id is 44
Server version: 10.6.7-MariaDB-2ubuntu1 Ubuntu 22.04
Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others.
Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
MariaDB [(none)]> show databases;
+--------------------+
| Database |
+--------------------+
| information_schema |
| openxe |
+--------------------+
2 rows in set (0.001 sec)
MariaDB [(none)]> quit
Bye
```
## --> Reset your server
Continue with [OpenXE Installation](INSTALL.md)

View File

@ -0,0 +1,20 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Bank
{
public string $accountOwner;
public string $bankName;
public string $iban;
public string $note1;
public string $note2;
public ?string $bic;
public ?string $accountreference;
}

View File

@ -0,0 +1,16 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Communication
{
public ?string $phone;
public ?string $email;
public ?string $contactPerson;
}

View File

@ -0,0 +1,16 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Contact
{
public ?Communication $Communication;
public ?NativeAddress $Address;
public ?Name $Name;
}

View File

@ -0,0 +1,24 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Country
{
public ?string $country;
public string $countryISOCode;
public ?string $state;
public static function Create(string $isoCode, ?string $state = null):Country {
$obj = new Country();
$obj->countryISOCode = $isoCode;
$obj->state = $state;
return $obj;
}
}

View File

@ -0,0 +1,20 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class CreateShipmentOrderRequest
{
public Version $Version;
public ShipmentOrder $ShipmentOrder;
public ?string $labelResponseType;
public ?string $groupProfileName;
public ?string $labelFormat;
public ?string $labelFormatRetoure;
public ?string $combinedPrinting;
}

View File

@ -0,0 +1,16 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class CreateShipmentOrderResponse
{
public Version $Version;
public Statusinformation $Status;
public ?CreationState $CreationState;
}

View File

@ -0,0 +1,17 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class CreationState
{
public string $sequenceNumber;
public ?string $shipmentNumber;
public ?string $returnShipmentNumber;
public LabelData $LabelData;
}

View File

@ -0,0 +1,20 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Customer
{
public Name $Name;
public ?string $vatID;
public string $EKP;
public NativeAddress $Address;
public Contact $Contact;
public ?Bank $Bank;
public ?string $note;
}

View File

@ -0,0 +1,15 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class DeleteShipmentOrderRequest
{
public Version $Version;
public string $shipmentNumber;
}

View File

@ -0,0 +1,16 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class DeleteShipmentOrderResponse
{
public Version $Version;
public Statusinformation $Status;
public ?DeletionState $DeletionState;
}

View File

@ -0,0 +1,15 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class DeletionState
{
public string $shipmentNumber;
public Statusinformation $Status;
}

View File

@ -0,0 +1,18 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class DeliveryAddress
{
public ?NativeAddress $NativeAddress;
public ?Postfiliale $PostOffice;
public ?PackStation $PackStation;
public ?string $streetNameCode;
public ?string $streetNumberCode;
}

View File

@ -0,0 +1,17 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Dimension
{
public int $length;
public int $width;
public int $height;
public ?string $unit;
}

View File

@ -0,0 +1,19 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class ExportDocPosition
{
public string $description;
public string $countryCodeOrigin;
public string $customsTariffNumber;
public int $amount;
public float $netWeightInKG;
public float $customsValue;
}

View File

@ -0,0 +1,40 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class ExportDocument
{
const TYPE_PRESENT = 'PRESENT';
const TYPE_DOCUMENT = 'DOCUMENT';
const TYPE_COMMERCIAL_GOODS = 'COMMERCIAL_GOODS';
const TYPE_COMMERCIAL_SAMPLE = 'COMMERCIAL_SAMPLE';
const TYPE_RETURN_OF_GOODS= 'RETURN_OF_GOODS';
const TYPE_OTHER = 'OTHER';
const TERMS_DDP = 'DDP';
const TERMS_DXV = 'DXV';
const TERMS_DAP = 'DAP';
const TERMS_DDX = 'DDX';
const TERMS_CPT = 'CPT';
public ?string $invoiceNumber;
public string $exportType;
public ?string $exportTypeDescription;
public ?string $termsOfTrade;
public string $placeOfCommital;
public ?float $additionalFee;
public ?string $customsCurrency;
public ?string $permitNumber;
public ?string $attestationNumber;
public ?string $addresseesCustomsReference;
public ?string $sendersCustomsReference;
public ?bool $WithElectronicExportNtfctn;
/** @var ExportDocPosition[] $ExportDocPosition */
public array $ExportDocPosition;
}

View File

@ -0,0 +1,23 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class LabelData
{
public Statusinformation $Status;
public ?string $shipmentNumber;
public ?string $labelUrl;
public ?string $labelData;
public ?string $returnLabelUrl;
public ?string $returnLabelData;
public ?string $exportLabelUrl;
public ?string $exportLabelData;
public ?string $codLabelUrl;
public ?string $codLabelData;
}

View File

@ -0,0 +1,16 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Name
{
public string $name1;
public ?string $name2;
public ?string $name3;
}

View File

@ -0,0 +1,25 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class NativeAddress
{
public string $streetName;
public ?string $streetNumber;
/**
* @var string[]
*/
public array $addressAddition;
public ?string $dispatchingInformation;
public string $zip;
public string $city;
public ?string $province;
public ?Country $Origin;
}

View File

@ -0,0 +1,18 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class NativeAddressNew
{
public string $streetName;
public ?string $streetNumber;
public string $zip;
public string $city;
public ?Country $Origin;
}

View File

@ -0,0 +1,19 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class PackStation
{
public string $postNumber;
public string $packstationNumber;
public string $zip;
public string $city;
public ?string $province;
public ?Country $Origin;
}

View File

@ -0,0 +1,18 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Postfiliale
{
public string $postfilialeNumber;
public string $postNumber;
public string $zip;
public string $city;
public ?Country $Origin;
}

View File

@ -0,0 +1,18 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Receiver
{
public string $name1;
public ?ReceiverNativeAddress $Address;
public ?PackStation $Packstation;
public ?Postfiliale $Postfiliale;
public ?Communication $Communication;
}

View File

@ -0,0 +1,23 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class ReceiverNativeAddress
{
public ?string $name2;
public ?string $name3;
public string $streetName;
public ?string $streetNumber;
public array|string|null $addressAddition;
public ?string $dispatchingInformation;
public string $zip;
public string $city;
public ?string $province;
public ?Country $Origin;
}

View File

@ -0,0 +1,28 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Shipment
{
public ShipmentDetails $ShipmentDetails;
public Shipper $Shipper;
public string $ShipperReference;
public Receiver $Receiver;
public ?Shipper $ReturnReceiver;
public ?ExportDocument $ExportDocument;
public ?string $feederSystem;
public function __construct()
{
$this->ShipmentDetails = new ShipmentDetails();
$this->Shipper = new Shipper();
$this->ShipperReference = '';
$this->Receiver = new Receiver();
}
}

View File

@ -0,0 +1,34 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
use DateTimeImmutable;
class ShipmentDetails
{
public string $product;
public string $accountNumber;
public string $customerReference;
private string $shipmentDate;
public string $costCentre;
public string $returnShipmentAccountNumber;
public string $returnShipmentReference;
public ShipmentItem $ShipmentItem;
public ShipmentService $Service;
public ShipmentNotification $Notification;
public Bank $BankData;
public function SetShipmentDate(DateTimeImmutable $date): void {
$this->shipmentDate = $date->format('Y-m-d');
}
public function GetShipmentDate(): DateTimeImmutable {
return DateTimeImmutable::createFromFormat('Y-m-d', $this->shipmentDate);
}
}

View File

@ -0,0 +1,17 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class ShipmentItem
{
public float $weightInKG;
public ?int $lengthInCM;
public ?int $widthInCM;
public ?int $heightInCM;
}

View File

@ -0,0 +1,15 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class ShipmentNotification
{
public string $recipientEmailAddress;
public ?string $templateId;
}

View File

@ -0,0 +1,16 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class ShipmentOrder
{
public string $sequenceNumber;
public Shipment $Shipment;
public ?Serviceconfiguration $PrintOnlyIfCodeable;
}

View File

@ -0,0 +1,13 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class ShipmentService
{
}

View File

@ -0,0 +1,22 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Shipper
{
public Name $Name;
public NativeAddressNew $Address;
public ?Communication $Communication;
public function __construct()
{
$this->Name = new Name();
$this->Address = new NativeAddressNew();
}
}

View File

@ -0,0 +1,15 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Status
{
public string $statuscode;
public string $statusDescription;
}

View File

@ -0,0 +1,15 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class StatusElement
{
public string $statusElement;
public string $statusMessage;
}

View File

@ -0,0 +1,19 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Statusinformation
{
public int $statusCode;
public string $statusText;
public array|string $statusMessage;
public string $statusType;
public StatusElement $errorMessage;
public StatusElement $warningMessage;
}

View File

@ -0,0 +1,16 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl\Data;
class Version
{
public string $majorRelease;
public string $minorRelease;
public ?string $build;
}

View File

@ -0,0 +1,76 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\Dhl;
use SoapClient;
use SoapHeader;
use Xentral\Carrier\Dhl\Data\CreateShipmentOrderRequest;
use Xentral\Carrier\Dhl\Data\CreateShipmentOrderResponse;
use Xentral\Carrier\Dhl\Data\CreationState;
use Xentral\Carrier\Dhl\Data\LabelData;
use Xentral\Carrier\Dhl\Data\Shipment;
use Xentral\Carrier\Dhl\Data\ShipmentOrder;
use Xentral\Carrier\Dhl\Data\Statusinformation;
use Xentral\Carrier\Dhl\Data\Version;
class DhlApi
{
private SoapClient $soapClient;
private const SANDBOX_URL = 'https://cig.dhl.de/services/sandbox/soap';
private const PRODUCTION_URL = 'https://cig.dhl.de/services/production/soap';
private const NAMESPACE_CIS = 'http://dhl.de/webservice/cisbase';
public function __construct(string $user, string $signature)
{
$this->soapClient = new SoapClient(__DIR__ . '/Wsdl/geschaeftskundenversand-api-3.4.0.wsdl', [
'login' => 'OpenXE_1',
'password' => 'cjzNEpGXxbbnRwcYLISX3ZTTcQrQrz',
'location' => self::PRODUCTION_URL,
'trace' => 1,
'connection_timeout' => 30,
'classmap' => [
'CreateShipmentOrderResponse' => CreateShipmentOrderResponse::class,
'CreationState' => CreationState::class,
'LabelData' => LabelData::class,
'Statusinformation' => Statusinformation::class,
'Version' => Version::class,
]
]);
$authHeader = new SoapHeader(self::NAMESPACE_CIS, 'Authentification', [
'user' => $user,
'signature' => $signature
]);
$this->soapClient->__setSoapHeaders($authHeader);
}
public function CreateShipment(Shipment $shipment): CreateShipmentOrderResponse|string
{
$request = new CreateShipmentOrderRequest();
$request->Version = $this->getVersion();
$request->ShipmentOrder = new ShipmentOrder();
$request->ShipmentOrder->Shipment = $shipment;
$request->ShipmentOrder->sequenceNumber = '1';
$request->labelResponseType = "B64";
try {
$response = $this->soapClient->createShipmentOrder($request);
return $response;
} catch (\SoapFault $e) {
return $e->getMessage();
}
}
private function getVersion() {
$version = new Version();
$version->majorRelease = '3';
$version->minorRelease = '4';
return $version;
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,340 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Version: 3.4.0
Date: 2022-08-01T22:00:51Z
--><wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
xmlns:cis="http://dhl.de/webservice/cisbase"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:bcs="http://dhl.de/webservices/businesscustomershipping/3.0"
targetNamespace="http://dhl.de/webservices/businesscustomershipping/3.0">
<wsdl:types>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified">
<xs:import namespace="http://dhl.de/webservice/cisbase"
schemaLocation="geschaeftskundenversand-api-3.4.0-schema-cis_base.xsd"/>
<xs:import namespace="http://dhl.de/webservices/businesscustomershipping/3.0"
schemaLocation="geschaeftskundenversand-api-3.4.0-schema-bcs_base.xsd"/>
</xs:schema>
</wsdl:types>
<wsdl:message name="AuthentificationHeaderMessage">
<wsdl:documentation>The authentication data.</wsdl:documentation>
<wsdl:part name="header" element="cis:Authentification"/>
</wsdl:message>
<wsdl:message name="createShipmentOrderMessage">
<wsdl:documentation>The shipmentdata for creating a shipment.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:CreateShipmentOrderRequest"> </wsdl:part>
</wsdl:message>
<wsdl:message name="createShipmentOrderResponseMessage">
<wsdl:documentation>The status of the createShipment operation and the identifier for the
shipment.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:CreateShipmentOrderResponse"> </wsdl:part>
</wsdl:message>
<wsdl:message name="validateShipmentMessage">
<wsdl:documentation>The shipmentdata for validating a shipment.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:ValidateShipmentOrderRequest"> </wsdl:part>
</wsdl:message>
<wsdl:message name="validateShipmentResponseMessage">
<wsdl:documentation>The status of the validateShipment operation and the identifier for the
shipment.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:ValidateShipmentResponse"> </wsdl:part>
</wsdl:message>
<wsdl:message name="deleteShipmentOrderMessage">
<wsdl:documentation>The identifier for the shipment which should be
deleted.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:DeleteShipmentOrderRequest"> </wsdl:part>
</wsdl:message>
<wsdl:message name="deleteShipmentOrderResponseMessage">
<wsdl:documentation>The status of the deletion operation.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:DeleteShipmentOrderResponse"> </wsdl:part>
</wsdl:message>
<wsdl:message name="doManifestMessage">
<wsdl:documentation>The identifier for the shipment which should be
manifested.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:DoManifestRequest"> </wsdl:part>
</wsdl:message>
<wsdl:message name="doManifestResponseMessage">
<wsdl:documentation>The status of the manifest operation.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:DoManifestResponse"> </wsdl:part>
</wsdl:message>
<wsdl:message name="getLabelMessage">
<wsdl:documentation>The identifier for the DD shipment for which the label url is
requested.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:GetLabelRequest"> </wsdl:part>
</wsdl:message>
<wsdl:message name="getLabelResponseMessage">
<wsdl:documentation>The status of the operation and the label url (if
available).</wsdl:documentation>
<wsdl:part name="part1" element="bcs:GetLabelResponse"> </wsdl:part>
</wsdl:message>
<wsdl:message name="getVersionRequestMessage">
<wsdl:documentation>The version of webservice implementation.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:Version"> </wsdl:part>
</wsdl:message>
<wsdl:message name="getVersionResponseMessage">
<wsdl:documentation>The version of webservice implementation.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:GetVersionResponse"> </wsdl:part>
</wsdl:message>
<wsdl:message name="getExportDocMessage">
<wsdl:documentation>The identifier for the DD shipment for which the label url is
requested.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:GetExportDocRequest"> </wsdl:part>
</wsdl:message>
<wsdl:message name="getExportDocResponseMessage">
<wsdl:documentation>The status of the operation and the label url (if
available).</wsdl:documentation>
<wsdl:part name="part1" element="bcs:GetExportDocResponse"> </wsdl:part>
</wsdl:message>
<wsdl:message name="getManifestRequestMessage">
<wsdl:documentation>Request a manifest of the given date / date range.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:GetManifestRequest"> </wsdl:part>
</wsdl:message>
<wsdl:message name="getManifestResponseMessage">
<wsdl:documentation>The status of the operation and the manifest url (if
available).</wsdl:documentation>
<wsdl:part name="part1" element="bcs:GetManifestResponse"> </wsdl:part>
</wsdl:message>
<wsdl:message name="updateShipmentOrderRequestMessage">
<wsdl:documentation>Request a manifest of the given date / date range.</wsdl:documentation>
<wsdl:part name="part1" element="bcs:UpdateShipmentOrderRequest"> </wsdl:part>
</wsdl:message>
<wsdl:message name="updateShipmentOrderResponseMessage">
<wsdl:documentation>The status of the operation and the manifest url (if
available).</wsdl:documentation>
<wsdl:part name="part1" element="bcs:UpdateShipmentOrderResponse"> </wsdl:part>
</wsdl:message>
<wsdl:message name="readShipmentOrderResponseMessage">
<wsdl:documentation>The status of the operation and the manifest url (if
available).</wsdl:documentation>
<wsdl:part name="part1" element="bcs:ReadShipmentOrderResponse"> </wsdl:part>
</wsdl:message>
<wsdl:portType name="GKV3XAPIServicePortType">
<wsdl:operation name="createShipmentOrder">
<wsdl:documentation>Creates shipments.</wsdl:documentation>
<wsdl:input message="bcs:createShipmentOrderMessage">
<wsdl:documentation>The shipment data.</wsdl:documentation>
</wsdl:input>
<wsdl:output message="bcs:createShipmentOrderResponseMessage">
<wsdl:documentation>The status of the createShipment operation and the identifier for the
shipment.</wsdl:documentation>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="validateShipment">
<wsdl:documentation>Creates shipments.</wsdl:documentation>
<wsdl:input message="bcs:validateShipmentMessage">
<wsdl:documentation>The shipment data.</wsdl:documentation>
</wsdl:input>
<wsdl:output message="bcs:validateShipmentResponseMessage">
<wsdl:documentation>The status of the validateShipment operation and the identifier for the
shipment.</wsdl:documentation>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="deleteShipmentOrder">
<wsdl:documentation>Deletes the requested shipments.</wsdl:documentation>
<wsdl:input message="bcs:deleteShipmentOrderMessage">
<wsdl:documentation>The identifier for the shipment which should be
deleted.</wsdl:documentation>
</wsdl:input>
<wsdl:output message="bcs:deleteShipmentOrderResponseMessage">
<wsdl:documentation>The status of the deletion operation.</wsdl:documentation>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="doManifest">
<wsdl:documentation>Manifest the requested DD shipments.</wsdl:documentation>
<wsdl:input message="bcs:doManifestMessage">
<wsdl:documentation>The identifier for the shipment which should be
manifested.</wsdl:documentation>
</wsdl:input>
<wsdl:output message="bcs:doManifestResponseMessage">
<wsdl:documentation>The status of the manifest operation.</wsdl:documentation>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getLabel">
<wsdl:documentation>Returns the request-url for getting a label.</wsdl:documentation>
<wsdl:input message="bcs:getLabelMessage">
<wsdl:documentation>The identifier for the shipment for which the label url is
requested.</wsdl:documentation>
</wsdl:input>
<wsdl:output message="bcs:getLabelResponseMessage">
<wsdl:documentation>The status of the operation and the label url (if
available).</wsdl:documentation>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getVersion">
<wsdl:documentation>Returns the actual version of the implementation of the whole ISService
webservice.</wsdl:documentation>
<wsdl:input message="bcs:getVersionRequestMessage"/>
<wsdl:output message="bcs:getVersionResponseMessage">
<wsdl:documentation>The version of webservice implementation.</wsdl:documentation>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getExportDoc">
<wsdl:documentation>Returns the request-url for getting a export
document.</wsdl:documentation>
<wsdl:input message="bcs:getExportDocMessage">
<wsdl:documentation>The identifier for the shipment for which the export document url is
requested.</wsdl:documentation>
</wsdl:input>
<wsdl:output message="bcs:getExportDocResponseMessage">
<wsdl:documentation>The status of the operation and the export document url (if
available).</wsdl:documentation>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getManifest">
<wsdl:documentation>Request the manifest.</wsdl:documentation>
<wsdl:input message="bcs:getManifestRequestMessage">
<wsdl:documentation>The request data.</wsdl:documentation>
</wsdl:input>
<wsdl:output message="bcs:getManifestResponseMessage">
<wsdl:documentation>The status of the getManifest operation and the manifest
url.</wsdl:documentation>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="updateShipmentOrder">
<wsdl:documentation>Updates a shipment order.</wsdl:documentation>
<wsdl:input message="bcs:updateShipmentOrderRequestMessage">
<wsdl:documentation>The shipment data.</wsdl:documentation>
</wsdl:input>
<wsdl:output message="bcs:updateShipmentOrderResponseMessage">
<wsdl:documentation>The status of the updateShipment operation and the identifier for the
shipment.</wsdl:documentation>
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="GKV3XAPISOAP11Binding" type="bcs:GKV3XAPIServicePortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="createShipmentOrder">
<wsdl:documentation>Creates shipments.</wsdl:documentation>
<soap:operation soapAction="urn:createShipmentOrder" style="document"/>
<wsdl:input>
<wsdl:documentation>The authentication data and the shipment data.</wsdl:documentation>
<soap:header message="bcs:AuthentificationHeaderMessage" part="header" use="literal"/>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<wsdl:documentation>The status of the operation and the shipment
identifier.</wsdl:documentation>
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="validateShipment">
<wsdl:documentation>Validates shipments.</wsdl:documentation>
<soap:operation soapAction="urn:validateShipment" style="document"/>
<wsdl:input>
<wsdl:documentation>The authentication data and the shipment data.</wsdl:documentation>
<soap:header message="bcs:AuthentificationHeaderMessage" part="header" use="literal"/>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<wsdl:documentation>The status of the operation and the shipment
identifier.</wsdl:documentation>
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="deleteShipmentOrder">
<wsdl:documentation>Deletes the requested shipments.</wsdl:documentation>
<soap:operation soapAction="urn:deleteShipmentOrder" style="document"/>
<wsdl:input>
<wsdl:documentation>The authentication data and the shipment
identifier.</wsdl:documentation>
<soap:header message="bcs:AuthentificationHeaderMessage" part="header" use="literal"/>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<wsdl:documentation>The status of the operation.</wsdl:documentation>
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="doManifest">
<wsdl:documentation>Manifest the requested shipments.</wsdl:documentation>
<soap:operation soapAction="urn:doManifest" style="document"/>
<wsdl:input>
<wsdl:documentation>The authentication data and the shipment
identifier.</wsdl:documentation>
<soap:header message="bcs:AuthentificationHeaderMessage" part="header" use="literal"/>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<wsdl:documentation>The status of the operation.</wsdl:documentation>
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getLabel">
<wsdl:documentation>Returns the request-url for getting a label.</wsdl:documentation>
<soap:operation soapAction="urn:getLabel" style="document"/>
<wsdl:input>
<wsdl:documentation>The authentication data and the shipment
identifier.</wsdl:documentation>
<soap:header message="bcs:AuthentificationHeaderMessage" part="header" use="literal"/>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<wsdl:documentation>The status of the operation and the url for requesting the
label.</wsdl:documentation>
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getVersion">
<wsdl:documentation>Returns the actual version of the implementation of the whole ISService
webservice.</wsdl:documentation>
<soap:operation soapAction="urn:getVersion" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<wsdl:documentation>The version of the implementation.</wsdl:documentation>
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getExportDoc">
<wsdl:documentation>Returns the request-url for getting a export
document.</wsdl:documentation>
<soap:operation soapAction="urn:getExportDoc" style="document"/>
<wsdl:input>
<wsdl:documentation>The authentication data and the shipment
identifier.</wsdl:documentation>
<soap:header message="bcs:AuthentificationHeaderMessage" part="header" use="literal"/>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<wsdl:documentation>The status of the operation and the url for requesting the export
document.</wsdl:documentation>
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getManifest">
<wsdl:documentation>Requests the manifest.</wsdl:documentation>
<soap:operation soapAction="urn:getManifest" style="document"/>
<wsdl:input>
<wsdl:documentation>The authentication data and the shipment data.</wsdl:documentation>
<soap:header message="bcs:AuthentificationHeaderMessage" part="header" use="literal"/>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<wsdl:documentation>The status of the operation and the manifest url.</wsdl:documentation>
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="updateShipmentOrder">
<wsdl:documentation>Updates a shipment order.</wsdl:documentation>
<soap:operation soapAction="urn:updateShipmentOrder" style="document"/>
<wsdl:input>
<wsdl:documentation>The authentication data and the shipment data.</wsdl:documentation>
<soap:header message="bcs:AuthentificationHeaderMessage" part="header" use="literal"/>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<wsdl:documentation>The status of the operation</wsdl:documentation>
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="GVAPI_2_0_de">
<wsdl:port name="GKVAPISOAP11port0" binding="bcs:GKV3XAPISOAP11Binding">
<soap:address location="https://cig.dhl.de/services/production/soap"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>

View File

@ -0,0 +1,31 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\SendCloud\Data;
class Document
{
public const TYPE_LABEL = 'label';
public const TYPE_CP71 = 'cp71';
public const TYPE_CN23 = 'cn23';
public const TYPE_CN23_DEFAULT = 'cn23-default';
public const TYPE_COMMERCIAL_INVOICE = 'commercial-invoice';
public string $Type;
public string $Size;
public string $Link;
public static function fromApiResponse(object $data): Document
{
$obj = new Document();
$obj->Type = $data->type;
$obj->Size = $data->size;
$obj->Link = $data->link;
return $obj;
}
}

View File

@ -0,0 +1,42 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\SendCloud\Data;
abstract class ParcelBase
{
public ?string $Name = null;
public ?string $CompanyName = null;
public ?string $Address = null;
public ?string $Address2 = null;
public ?string $HouseNumber = null;
public ?string $City = null;
public ?string $PostalCode = null;
public ?string $Telephone = null;
public bool $RequestLabel = true;
public ?string $EMail = null;
public ?string $Country = null;
public ?int $ShippingMethodId = null;
/**
* @var ?int weight in grams
*/
public ?int $Weight = null;
public ?string $OrderNumber = null;
public ?string $TotalOrderValueCurrency = null;
public ?float $TotalOrderValue = null;
public ?string $CountryState = null;
public ?string $CustomsInvoiceNr = null;
public ?int $CustomsShipmentType = null;
public ?string $ExternalReference = null;
public ?int $TotalInsuredValue = null;
public ?array $ParcelItems = array();
public bool $IsReturn = false;
public ?string $Length = null;
public ?string $Width = null;
public ?string $Height = null;
}

View File

@ -0,0 +1,51 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\SendCloud\Data;
class ParcelCreation extends ParcelBase
{
public ?int $SenderAddressId = null;
public function toApiRequest(): array
{
$data = [
'name' => $this->Name,
'company_name' => $this->CompanyName,
'address' => $this->Address,
'address_2' => $this->Address2,
'house_number' => $this->HouseNumber,
'city' => $this->City,
'postal_code' => $this->PostalCode,
'telephone' => $this->Telephone,
'request_label' => $this->RequestLabel,
'email' => $this->EMail,
'country' => $this->Country,
'shipment' => ['id' => $this->ShippingMethodId],
'weight' => number_format($this->Weight / 1000, 3, '.', null),
'order_number' => $this->OrderNumber,
'total_order_value_currency' => $this->TotalOrderValueCurrency,
'total_order_value' => number_format($this->TotalOrderValue, 2, '.', null),
'country_state' => $this->CountryState,
'sender_address' => $this->SenderAddressId,
'external_reference' => $this->ExternalReference,
'total_insured_value' => $this->TotalInsuredValue ?? 0,
'parcel_items' => array_map(fn(ParcelItem $item) => $item->toApiRequest(), $this->ParcelItems),
'is_return' => $this->IsReturn,
'length' => $this->Length,
'width' => $this->Width,
'height' => $this->Height,
];
if ($this->CustomsInvoiceNr !== null)
$data['customs_invoice_nr'] = $this->CustomsInvoiceNr;
if ($this->CustomsShipmentType !== null)
$data['customs_shipment_type'] = $this->CustomsShipmentType;
return $data;
}
}

View File

@ -0,0 +1,16 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\SendCloud\Data;
class ParcelCreationError
{
public int $Code;
public string $Message;
public string $Request;
}

View File

@ -0,0 +1,52 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\SendCloud\Data;
class ParcelItem
{
public string $HsCode;
/**
* @var int weight in grams
*/
public int $Weight;
public int $Quantity;
public string $Description;
public string $OriginCountry;
public float $Price;
public ?string $Sku = null;
public ?string $ProductId = null;
public function toApiRequest(): array {
return [
'hs_code' => $this->HsCode,
'weight' => number_format($this->Weight / 1000, 3, '.', null),
'quantity' => $this->Quantity,
'description' => $this->Description,
'value' => $this->Price,
'origin_country' => $this->OriginCountry,
'sku' => $this->Sku ?? '',
'product_id' => $this->ProductId ?? '',
];
}
public static function fromApiResponse(object $data): ParcelItem
{
$obj = new ParcelItem();
$obj->HsCode = $data->hs_code;
$obj->Weight = intval(floatval($data->weight)*1000);
$obj->Quantity = $data->quantity;
$obj->Description = $data->description;
$obj->Price = $data->value;
$obj->OriginCountry = $data->origin_country;
$obj->Sku = $data->sku;
$obj->ProductId = $data->product_id;
return $obj;
}
}

View File

@ -0,0 +1,82 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\SendCloud\Data;
use DateTimeImmutable;
use Exception;
class ParcelResponse extends ParcelBase
{
public int $Id;
public string $CarrierCode;
public DateTimeImmutable $DateCreated;
public DateTimeImmutable $DateUpdated;
public DateTimeImmutable $DateAnnounced;
public string $ShipmentMethodName;
public int $StatusId;
public string $StatusMessage;
public array $Documents;
public ?string $TrackingNumber = null;
public ?string $TrackingUrl = null;
public ?array $Errors;
public function GetDocumentByType(string $type): ?Document
{
/** @var Document $item */
foreach ($this->Documents as $item)
if ($item->Type == $type)
return $item;
return null;
}
/**
* @throws Exception
*/
public static function fromApiResponse(object $data): ParcelResponse
{
$obj = new ParcelResponse();
$obj->Address = $data->address_divided->street;
$obj->Address2 = $data->address_2;
$obj->HouseNumber = $data->address_divided->house_number;
$obj->CarrierCode = $data->carrier->code;
$obj->City = $data->city;
$obj->CompanyName = $data->company_name;
$obj->Country = $data->country->iso_2;
$obj->CustomsInvoiceNr = $data->customs_invoice_nr;
$obj->CustomsShipmentType = $data->customs_shipment_type;
$obj->DateCreated = new DateTimeImmutable($data->date_created);
$obj->DateUpdated = new DateTimeImmutable($data->date_updated);
$obj->DateAnnounced = new DateTimeImmutable($data->date_announced);
$obj->EMail = $data->email;
$obj->Id = $data->id;
$obj->Name = $data->name;
$obj->OrderNumber = $data->order_number;
$obj->ParcelItems = array_map(fn($item)=>ParcelItem::fromApiResponse($item), $data->parcel_items);
$obj->PostalCode = $data->postal_code;
$obj->ExternalReference = $data->external_reference;
$obj->ShippingMethodId = $data->shipment->id;
$obj->ShipmentMethodName = $data->shipment->name;
$obj->StatusId = $data->status->id;
$obj->StatusMessage = $data->status->message;
$obj->Documents = array_map(fn($item)=>Document::fromApiResponse($item), $data->documents);
$obj->Telephone = $data->telephone;
$obj->TotalInsuredValue = $data->total_insured_value;
$obj->TotalOrderValue = $data->total_order_value;
$obj->TotalOrderValueCurrency = $data->total_order_value_currency;
$obj->TrackingNumber = $data->tracking_number;
$obj->TrackingUrl = $data->tracking_url;
$obj->Weight = $data->weight;
$obj->Length = $data->length;
$obj->Height = $data->height;
$obj->Width = $data->width;
$obj->IsReturn = $data->is_return;
$obj->Errors = $data->errors->non_field_errors;
return $obj;
}
}

View File

@ -0,0 +1,59 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\SendCloud\Data;
class SenderAddress {
public ?string $City;
public ?string $CompanyName;
public ?string $ContactName;
public string $Country;
public ?string $CountryState;
public ?string $Email;
public ?string $HouseNumber;
public int $Id;
public ?string $PostalBox;
public ?string $PostalCode;
public ?string $Street;
public ?string $Telephone;
public ?string $VatNumber;
public ?string $EoriNumber;
public int $BrandId;
public ?string $Label;
public ?string $SignatureFullName;
public ?string $SignatureInitials;
public function __toString(): string
{
return "$this->CompanyName; $this->ContactName; $this->Street $this->HouseNumber; $this->PostalCode; $this->City";
}
public static function fromApiResponse(object $data): SenderAddress {
$obj = new SenderAddress();
$obj->City = $data->city;
$obj->CompanyName = $data->company_name;
$obj->ContactName = $data->contact_name;
$obj->Country = $data->country;
$obj->CountryState = $data->country_state;
$obj->Email = $data->email;
$obj->HouseNumber = $data->house_number;
$obj->Id = $data->id;
$obj->PostalBox = $data->postal_box;
$obj->PostalCode = $data->postal_code;
$obj->Street = $data->street;
$obj->Telephone = $data->telephone;
$obj->VatNumber = $data->vat_number;
$obj->EoriNumber = $data->eori_number;
$obj->BrandId = $data->brand_id;
$obj->Label = $data->label;
$obj->SignatureFullName = $data->signature_full_name;
$obj->SignatureInitials = $data->signature_initials;
return $obj;
}
}

View File

@ -0,0 +1,35 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\SendCloud\Data;
class ShippingMethod {
public int $Id;
public string $Name;
public ?string $Carrier;
public int $MinWeight;
public int $MaxWeight;
public int $MaxLength;
public int $MaxWidth;
public int $MaxHeight;
public string $Unit;
public static function fromApiResponse(object $data):ShippingMethod {
$obj = new ShippingMethod();
$obj->Id = $data->id;
$obj->Name = $data->name;
$obj->Carrier = $data->carrier ?? null;
$obj->MinWeight = $data->properties->min_weight;
$obj->MaxWeight = $data->properties->max_weight;
$obj->MaxLength = $data->properties->max_dimensions->length;
$obj->MaxWidth = $data->properties->max_dimensions->width;
$obj->MaxHeight = $data->properties->max_dimensions->height;
$obj->Unit = $data->properties->max_dimensions->unit;
return $obj;
}
}

View File

@ -0,0 +1,35 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\SendCloud\Data;
class ShippingProduct {
public string $Name;
public string $Carrier;
public string $ServicePointsCarrier;
public string $Code;
public int $MinWeight;
public int $MaxWeight;
public array $ShippingMethods;
public static function fromApiResponse(object $data): ShippingProduct {
$obj = new ShippingProduct();
$obj->Name = $data->name;
$obj->Carrier = $data->carrier;
$obj->ServicePointsCarrier = $data->service_points_carrier;
$obj->Code = $data->code;
$obj->MinWeight = $data->weight_range->min_weight;
$obj->MaxWeight = $data->weight_range->max_weight;
foreach ($data->methods as $method) {
$child = ShippingMethod::fromApiResponse($method);
$child->Carrier = $obj->Carrier;
$obj->ShippingMethods[] = $child;
}
return $obj;
}
}

View File

@ -0,0 +1,163 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\SendCloud;
use Exception;
use Xentral\Carrier\SendCloud\Data\Document;
use Xentral\Carrier\SendCloud\Data\ParcelCreation;
use Xentral\Carrier\SendCloud\Data\ParcelResponse;
use Xentral\Carrier\SendCloud\Data\SenderAddress;
use Xentral\Carrier\SendCloud\Data\ShippingProduct;
class SendCloudApi
{
/**
* @var ?string $public_key
*/
protected ?string $public_key;
/**
* @var ?string $private_key
*/
protected ?string $private_key;
const PROD_BASE_URI = 'https://panel.sendcloud.sc/api/v2';
public function __construct($public_key, $private_key)
{
$this->public_key = $public_key;
$this->private_key = $private_key;
}
/**
* @throws SendcloudApiException
*/
public function GetSenderAddresses(): array
{
$uri = self::PROD_BASE_URI . '/user/addresses/sender';
$response = $this->sendRequest($uri);
foreach ($response['body']->sender_addresses as $item)
$res[] = SenderAddress::fromApiResponse($item);
return $res ?? [];
}
/**
* @throws SendcloudApiException
*/
public function GetShippingProducts(string $sourceCountry, ?string $targetCountry = null, ?int $weight = null,
?int $height = null, ?int $length = null, ?int $width = null): array
{
$uri = self::PROD_BASE_URI . '/shipping-products';
$params = ['from_country' => $sourceCountry];
if ($targetCountry !== null)
$params['to_country'] = $targetCountry;
if ($weight !== null && $weight > 0)
$params['weight'] = $weight;
if ($height !== null && $height > 0) {
$params['height'] = $height;
$params['height_unit'] = 'centimeter';
}
if ($length !== null && $length > 0) {
$params['length'] = $length;
$params['length_unit'] = 'centimeter';
}
if ($width !== null && $width > 0) {
$params['width'] = $width;
$params['width_unit'] = 'centimeter';
}
$response = $this->sendRequest($uri, $params);
return array_map(fn($x) => ShippingProduct::fromApiResponse($x), $response['body'] ?? []);
}
/**
* @throws SendcloudApiException
*/
public function CreateParcel(ParcelCreation $parcel): ParcelResponse|string|null
{
$uri = self::PROD_BASE_URI . '/parcels';
$response = $this->sendRequest($uri, null, true, ['parcel' => $parcel->toApiRequest()], [200,400]);
switch ($response['code']) {
case 200:
if (isset($response['body']->parcel))
try {
return ParcelResponse::fromApiResponse($response['body']->parcel);
} catch (Exception $e) {
throw new SendcloudApiException(previous: $e);
}
break;
case 400:
if (isset($response->error))
return $response->error->message;
break;
}
throw SendcloudApiException::fromResponse($response);
}
/**
* @throws SendcloudApiException
*/
public function DownloadDocument(Document $document): string
{
$curl = curl_init();
curl_setopt_array($curl, [
CURLOPT_RETURNTRANSFER => 1,
CURLOPT_URL => $document->Link,
CURLOPT_HTTPHEADER => [
"Authorization: Basic " . base64_encode($this->public_key . ':' . $this->private_key)
],
]);
$output = curl_exec($curl);
$code = curl_getinfo($curl, CURLINFO_RESPONSE_CODE);
if ($code != 200)
throw SendcloudApiException::fromResponse(['code' => $code, 'body' => $output]);
return $output;
}
/**
* @throws SendcloudApiException
*/
function sendRequest(string $uri, array $query_params = null, bool $post = false, array $postFields = null,
array $allowedResponseCodes = [200]): ?array
{
if (empty($this->public_key) || empty($this->private_key))
return null;
$curl = curl_init();
if (is_array($query_params)) {
$uri .= '?' . http_build_query($query_params);
}
curl_setopt_array($curl, [
CURLOPT_RETURNTRANSFER => 1,
CURLOPT_URL => $uri,
CURLOPT_HTTPHEADER => [
"Authorization: Basic " . base64_encode($this->public_key . ':' . $this->private_key),
'Content-Type: application/json'
],
]);
if ($post === true) {
curl_setopt_array($curl, [
CURLOPT_POST => true,
CURLOPT_POSTFIELDS => json_encode($postFields)
]);
}
$output = json_decode(curl_exec($curl));
$code = curl_getinfo($curl, CURLINFO_RESPONSE_CODE);
curl_close($curl);
$ret = [
'code' => $code,
'body' => $output,
];
if (!in_array($code, $allowedResponseCodes))
throw SendcloudApiException::fromResponse($ret);
return $ret;
}
}

View File

@ -0,0 +1,24 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Xentral\Carrier\SendCloud;
use Exception;
class SendcloudApiException extends Exception
{
public static function fromResponse(array $response) : SendcloudApiException {
if (!isset($response['body']) || !is_object($response['body']))
return new SendcloudApiException(print_r($response,true));
return new SendcloudApiException(
print_r($response['body'],true),
$response['code']
);
}
}

View File

@ -66,7 +66,7 @@ final class DatabaseLogHandler extends AbstractLogHandler
$sql = 'INSERT INTO `log`
(`log_time`, `level`, `message`, `class`, `method`, `line`, `origin_type`, `origin_detail`, `dump`)
VALUES
(NOW(), :level, :message, :class, :method, :line, :origin_type, :origin_detail, :dump)';
(NOW(3), :level, :message, :class, :method, :line, :origin_type, :origin_detail, :dump)';
$this->db->perform($sql, $values);
}
}

View File

@ -128,7 +128,7 @@ final class ImapMailClient implements MailClientInterface
$message = $this->imap->getMessage($msgNumber);
} catch (Exception $e) {
throw new MessageNotFoundException(
sprintf('Message number %s not found.', $msgNumber)
sprintf("Message number %s could not be fetched.\n\r%s", $msgNumber,print_r($e,true))
);
}

View File

@ -51,32 +51,99 @@ class MailAttachmentData implements MailAttachmentInterface
$this->cid = $cid;
}
/*
Check the type of Attachment
Possible results: application/octet-stream, attachment, inline
*/
public static function getAttachmentPartType(MailMessagePartInterface $part): ?string {
if (!$part->isMultipart()) {
$header = $part->getHeader('content-disposition');
if ($header !== null) {
$split = explode(';', $header->getValue());
if ($split[0] === 'attachment') {
return ('attachment');
} else if ($split[0] === 'inline') {
return ('inline');
}
} else { // Check for application/octet-stream
$content_type = $part->getContentType();
if ($content_type == 'application/octet-stream') {
return('application/octet-stream');
}
}
}
return(null);
}
/**
* @param MailMessagePartInterface $part
*
* @throws InvalidArgumentException
*
* @return MailAttachmentData
*/
public static function fromMailMessagePart(MailMessagePartInterface $part): MailAttachmentData
{
$attachmenttype = MailAttachmentData::getAttachmentPartType($part);
if ($attachmenttype == null) {
throw new InvalidArgumentException('object is no attachment');
}
$disposition = $part->getHeaderValue('content-disposition');
if ($disposition == null) {
$disposition = '';
}
$disposition = str_replace(["\n\r", "\n", "\r"], '', $disposition);
// file_put_contents('debug.txt',date("HH:mm:ss")."\nDispo: ".$disposition); // FILE_APPEND
// Determine filename
/*
Content-Disposition: inline
Content-Disposition: attachment
Content-Disposition: attachment; filename="filename.jpg"
This is not correctly implemented -> only the first string is evaluated
Content-Disposition: attachment; filename*0="filename_that_is_"
Content-Disposition: attachment; filename*1="very_long.jpg"
*/
$filename = 'OpenXE_file.unknown';
if (preg_match('/(.+);\s*filename(?:\*[0-9]){0,1}="*([^"]+)"*.*$/m', $disposition, $matches)) { // Filename in disposition
$filename = $matches[2];
} else {
$contenttype = $part->getHeaderValue('content-type');
$contenttype = str_replace(["\n\r", "\n", "\r"], '', $contenttype);
// file_put_contents('debug.txt',date("HH:mm:ss")."\nConttype: ".$contenttype,FILE_APPEND); // FILE_APPEND
if (preg_match('/(.+);\s*name(?:\*[0-9]){0,1}="*([^"]+)"*.*$/m', $contenttype, $matches)) { // Name in content-type
$filename = $matches[2];
} else if ($contenttype == 'message/rfc822') { // RFC822 message
$filename = 'ForwardedMessage.eml';
}
}
$encodingHeader = $part->getHeader('content-transfer-encoding');
if ($encodingHeader === null) {
throw new InvalidArgumentException('missing header: "Content-Transfer-Encoding"');
$content_transfer_encoding = '';
} else {
$content_transfer_encoding = $encodingHeader->getValue();
}
$encoding = $encodingHeader->getValue();
$dispositionHeader = $part->getHeader('content-disposition');
if ($dispositionHeader === null) {
throw new InvalidArgumentException('missing header: "Content-Disposition"');
// Thunderbird UTF URL-Format
$UTF_pos = strpos($filename,'UTF-8\'\'');
if ($UTF_pos !== false) {
$wasUTF = "JA";
$filename = substr($filename,$UTF_pos);
$filename = rawurldecode($filename);
}
$disposition = $dispositionHeader->getValue();
if (!preg_match('/(.+);\s*filename="([^"]+)".*$/m', $disposition, $matches)) {
throw new InvalidArgumentException(
sprintf('unexpected header value "Content-Disposition" = %s', $disposition)
);
}
$isInline = strtolower($matches[1]) === 'inline';
$filename = $matches[2];
$cid = null;
$contentIdHeader = $part->getHeader('content-id');
if ($contentIdHeader !== null) {
@ -85,13 +152,24 @@ class MailAttachmentData implements MailAttachmentInterface
$cid = $cidMatches[1];
}
}
if ($attachmenttype == 'inline' && $cid != null) {
$filename = "cid:".$cid;
}
$content = $part->getContent();
if ($content === null) { // This should not be
// file_put_contents('debug.txt',date("HH:mm:ss")."\n".print_r($part,true)); // FILE_APPEND
throw new InvalidArgumentException(
sprintf('content is null "%s"', substr(print_r($part,true),0,1000))
);
}
return new self(
$filename,
$part->getContent(),
$content,
$part->getContentType(),
$encoding,
$isInline,
$content_transfer_encoding,
$attachmenttype == 'inline',
$cid
);
}

View File

@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Xentral\Components\MailClient\Data;
use DateTime;
use DateTimeImmutable;
use DateTimeInterface;
use JsonSerializable;
use Throwable;
@ -147,6 +148,7 @@ final class MailMessageData implements MailMessageInterface, JsonSerializable
$parts = [];
$this->findAttachmentParts($this->contentPart, $parts);
$attachments = [];
foreach ($parts as $part) {
$attachments[] = MailAttachmentData::fromMailMessagePart($part);
}
@ -161,19 +163,17 @@ final class MailMessageData implements MailMessageInterface, JsonSerializable
* @return void
*/
private function findAttachmentParts(MailMessagePartInterface $part, array &$resultArray): void
{
try {
$header = $part->getHeader('content-disposition');
$split = explode(';', $header->getValue());
if ($split[0] === 'attachment' || $split[0] === 'inline') {
$resultArray[] = $part;
{
return;
}
} catch (Throwable $e) {
if ($part->isMultipart()) {
// Recurse subparts
for ($i = 0; $i < $part->countParts(); $i++) {
$this->findAttachmentParts($part->getPart($i), $resultArray);
}
} else {
if (MailAttachmentData::getAttachmentPartType($part) != null) {
$resultArray[] = $part;
}
}
}
@ -308,13 +308,13 @@ final class MailMessageData implements MailMessageInterface, JsonSerializable
if ($date === null) {
return null;
}
$dateTime = DateTime::createFromFormat(DateTimeInterface::RFC2822, $date->getValue());
if ($dateTime === false) {
$dateTime = DateTime::createFromFormat(DateTimeInterface::RFC822, $date->getValue());
}
/* $dateTime = date_create($date->getValue());
if ($dateTime === false) {
throw new InvalidArgumentException('Invalid date: '.$date->getValue());
return null;
}
}*/
$dateTime = new DateTimeImmutable($date->getValue());
return $dateTime;
}

View File

@ -83,6 +83,18 @@ final class MailMessagePartData implements MailMessagePartInterface, JsonSeriali
return $this->headers[strtolower($name)];
}
/**
* @inheritDoc
*/
public function getHeaderValue(string $name): ?string
{
$header = $this->getHeader($name);
if ($header == null) {
return (null);
}
return($header->getValue());
}
/**
* @inheritDoc
*/
@ -97,6 +109,33 @@ final class MailMessagePartData implements MailMessagePartInterface, JsonSeriali
return $split[0];
}
/**
* @inheritDoc
*/
public function getCharset(): ?string
{
$header = $this->getHeader('content-type');
if ($header === null) {
return '';
}
$pattern = "/([a-zA-Z]*[\/]*[a-zA-Z]*);[a-zA-Z\n\t\r0-9 ]*charset=\"([a-zA-Z-0-9]+)\"/i";
$matches = array();
if (preg_match(
$pattern,
$header->getValue(),
$matches
)) {
if (count($matches) >= 3) {
return($matches[2]);
} else {
return(null);
}
}
else {
return(null);
}
}
/**
* @inheritDoc
*/
@ -116,17 +155,30 @@ final class MailMessagePartData implements MailMessagePartInterface, JsonSeriali
/**
* @return string|null
*/
public function getDecodedContent(): ?string
public function getDecodedContent(string $to_charset = 'UTF-8'): ?string
{
$result = '';
if ($this->content === null) {
return null;
}
$encodingHeader = $this->getHeader('content-transfer-encoding');
if ($encodingHeader === null ) {
return $this->content;
$result = $this->content;
}
else {
$result = $this->decode($this->content, $encodingHeader->getValue());
}
return $this->decode($this->content, $encodingHeader->getValue());
$charset = $this->getCharset();
// throw new InvalidArgumentException('Charset is '.$charset." Text is: ".$result);
$converted = mb_convert_encoding(
$result,
$to_charset,
$charset
);
return($converted);
}
/**

View File

@ -23,7 +23,7 @@ final class FactoryMethodDefinition
if (!is_callable($callable, false)) {
/*
xenomporio
OpenXE-todo
unknown compatibility issue
commented out as hotfix

View File

@ -20,7 +20,7 @@ final class ErrorPageData implements JsonSerializable
public function __construct($exception, $title = null)
{
$this->exception = $exception;
$this->title = !empty($title) ? (string)$title : 'Xenomporio: Es ist ein unerwarteter Fehler aufgetreten!';
$this->title = !empty($title) ? (string)$title : 'DBXE: Es ist ein unerwarteter Fehler aufgetreten!';
}

View File

@ -35,7 +35,7 @@ final class Psr4ClassNameResolver
{
// Normalize inputs
$prefix = trim($prefix, '\\') . '\\';
$baseDir = rtrim($baseDir, '/') . '/';
$baseDir = rtrim($baseDir, '/\\') . DIRECTORY_SEPARATOR;
$this->prefixes[$prefix] = $baseDir;
}

View File

@ -48,7 +48,11 @@ final class MultiDbArrayHydrator
$description = !empty($item['description']) ? $item['description'] : $defaultConfig->WFdbname;
// Cronjobs nur aktivieren, wenn Einstellung vorhanden und gesetzt (Default `false`).
$cronjobsActive = (int)$item['cronjob'] === 1;
if (array_key_exists('cronjob',$item)) {
$cronjobsActive = (int)$item['cronjob'] === 1;
} else {
$cronjobsActive = false;
}
if(!empty($item['dbname']) && $defaultConfig->WFdbname === $item['dbname']) {
$item = [];

View File

@ -492,6 +492,8 @@ final class ReportService
$testResult['messagetype'] = 'error';
$testResult['message'] = sprintf("QUERY FAILED:\n%s", $e->getMessage());
$testResult['message'] .= "\n\r".$compiled;
return $testResult;
}
@ -500,6 +502,9 @@ final class ReportService
if(count($rows) < 101){
$message = sprintf('Query successful: %s datasets found', count($rows));
}
$message .= "\n\r".print_r($rows[0],true);
$testResult = [
'messagetype' => 'success',
'message' => $message,

View File

@ -0,0 +1,19 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: LicenseRef-EGPL-3.1
*/
namespace Xentral\Modules\ShippingMethod\Model;
class CreateShipmentResult
{
public bool $Success = false;
public array $Errors = [];
public ?string $Label;
public ?string $ExportDocuments;
public ?string $TrackingNumber;
public ?string $TrackingUrl;
}

View File

@ -0,0 +1,19 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: LicenseRef-EGPL-3.1
*/
namespace Xentral\Modules\ShippingMethod\Model;
class CustomsInfo
{
const CUSTOMS_TYPE_GIFT = 0;
const CUSTOMS_TYPE_DOCUMENTS = 1;
const CUSTOMS_TYPE_GOODS = 2;
const CUSTOMS_TYPE_SAMPLE = 3;
const CUSTOMS_TYPE_RETURN = 4;
}

View File

@ -0,0 +1,63 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
*
* SPDX-License-Identifier: LicenseRef-EGPL-3.1
*/
namespace Xentral\Modules\ShippingMethod\Model;
class Product
{
const SERVICE_COD = 'cod';
const SERVICE_PREMIUM = 'premium';
public string $Id;
public string $Name;
public float $LengthMin = 0;
public float $LengthMax = 500;
public float $WidthMin = 0;
public float $WidthMax = 500;
public float $HeightMin = 0;
public float $HeightMax = 500;
public float $WeightMin = 0;
public float $WeightMax = 100;
public array $AvailableServices = [];
public static function Create(string $id, string $name):Product {
$obj = new Product();
$obj->Id = $id;
$obj->Name = $name;
return $obj;
}
public function WithLength(float $min, float $max): Product {
$this->LengthMin = $min;
$this->LengthMax = $max;
return $this;
}
public function WithWidth(float $min, float $max): Product {
$this->WidthMin = $min;
$this->WidthMax = $max;
return $this;
}
public function WithHeight(float $min, float $max): Product {
$this->HeightMin = $min;
$this->HeightMax = $max;
return $this;
}
public function WithWeight(float $min, float $max): Product {
$this->WeightMin = $min;
$this->WeightMax = $max;
return $this;
}
public function WithServices(array $services): Product {
$this->AvailableServices = $services;
return $this;
}
}

View File

@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
* SPDX-FileCopyrightText: 2019 Xentral (c) Xentral ERP Software GmbH, Fuggerstrasse 11, D-86150 Augsburg, Germany
*
* SPDX-License-Identifier: LicenseRef-EGPL-3.1
*/
var ShippingMethodCreate = function ($) {
'use strict';
@ -11,35 +18,14 @@ var ShippingMethodCreate = function ($) {
vueElementId: '#shipment-create',
},
search: function (el) {
$.ajax({
url: 'index.php?module=versandarten&action=create&cmd=suche',
type: 'POST',
dataType: 'json',
data: {
val: $(el).val()
}
let val = $(el).val().toLowerCase();
$('.createbutton').each(function() {
let desc = $(this).find('.tilegrid-tile-title').text();
if (desc.toLowerCase().indexOf(val)>=0)
$(this).show();
else
$(this).hide();
})
.done(function (data) {
if (typeof data != 'undefined' && data != null) {
if (typeof data.ausblenden != 'undefined' && data.ausblenden != null) {
me.storage.hideElements = data.ausblenden.split(';');
$.each(me.storage.hideElements, function (k, v) {
if (v != '') {
$('#' + v).hide();
}
});
}
if (typeof data.anzeigen != 'undefined' && data.anzeigen != null) {
me.storage.showElements = data.anzeigen.split(';');
$.each(me.storage.showElements, function (k, v) {
if (v != '') {
$('#' + v).show();
}
});
}
}
});
},
init: function () {
if ($(me.selector.vueElementId).length === 0) {

View File

@ -73,7 +73,7 @@ final class Shopware6Client
$request = new ClientRequest(
$method,
$this->url . 'v2/' . $endpoint,
$this->url . $endpoint,
$headerInformation,
empty($body) ? null : json_encode($body)
);

View File

@ -1,10 +1,17 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
* SPDX-FileCopyrightText: 2019 Xentral ERP Sorftware GmbH, Fuggerstrasse 11, D-86150 Augsburg
* SPDX-License-Identifier: LicenseRef-EGPL-3.1
*/
declare(strict_types=1);
namespace Xentral\Modules\SubscriptionCycle;
use Aboabrechnung;
use Sabre\CalDAV\Subscriptions\Subscription;
use Xentral\Components\SchemaCreator\Collection\SchemaCollection;
use Xentral\Components\SchemaCreator\Schema\TableSchema;
use Xentral\Components\SchemaCreator\Type;
@ -35,6 +42,7 @@ final class Bootstrap
'SubscriptionCycleJobService' => 'onInitSubscriptionCycleJobService',
'SubscriptionCycleFullTask' => 'onInitSubscriptionCycleFullTask',
'TaskMutexService' => 'onInitTaskMutexService',
'SubscriptionModule' => 'onInitSubscriptionModule'
];
}
@ -60,20 +68,12 @@ final class Bootstrap
*/
public static function onInitSubscriptionCycleManualJobTask(ContainerInterface $container
): SubscriptionCycleManualJobTask {
$legacyApp = $container->get('LegacyApplication');
$subscriptionCycleModule = $legacyApp->loadModule('rechnungslauf');
$subscriptionModule = new Aboabrechnung($legacyApp);
$subscriptionModule->cronjob = true;
return new SubscriptionCycleManualJobTask(
$legacyApp,
$container->get('LegacyApplication'),
$container->get('Database'),
$container->get('TaskMutexService'),
$container->get('SubscriptionCycleJobService'),
$subscriptionCycleModule,
$subscriptionModule,
!empty($legacyApp->erp->GetKonfiguration('rechnungslauf_gruppen'))
$container->get('SubscriptionModule')
);
}
@ -210,22 +210,10 @@ final class Bootstrap
);
}
/**
* @param SchemaCollection $collection
*
* @return void
*/
public static function registerTableSchemas(SchemaCollection $collection): void
{
$subscriptionCycleJob = new TableSchema('subscription_cycle_job');
$subscriptionCycleJob->addColumn(Type\Integer::asAutoIncrement('id'));
$subscriptionCycleJob->addColumn(new Type\Integer('address_id'));
$subscriptionCycleJob->addColumn(new Type\Varchar('document_type', 32));
$subscriptionCycleJob->addColumn(new Type\Varchar('job_type', 32));
$subscriptionCycleJob->addColumn(new Type\Integer('printer_id'));
$subscriptionCycleJob->addColumn(new Type\Timestamp('created_at', 'CURRENT_TIMESTAMP'));
$subscriptionCycleJob->addIndex(new Index\Primary(['id']));
$subscriptionCycleJob->addIndex(new Index\Index(['address_id']));
$collection->add($subscriptionCycleJob);
public static function onInitSubscriptionModule(ContainerInterface $container): SubscriptionModule {
return new SubscriptionModule(
$container->get('LegacyApplication'),
$container->get('Database')
);
}
}

View File

@ -1,4 +1,9 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
* SPDX-FileCopyrightText: 2019 Xentral ERP Sorftware GmbH, Fuggerstrasse 11, D-86150 Augsburg
* SPDX-License-Identifier: LicenseRef-EGPL-3.1
*/
declare(strict_types=1);
@ -16,52 +21,33 @@ use Xentral\Modules\SubscriptionCycle\SubscriptionModuleInterface;
final class SubscriptionCycleManualJobTask
{
/** @var ApplicationCore $app */
private $app;
private ApplicationCore $app;
private Database $db;
private SubscriptionCycleJobService $cycleJobService;
private TaskMutexServiceInterface $taskMutexService;
private SubscriptionModuleInterface $subscriptionModule;
/** @var Database $db */
private $db;
/** @var SubscriptionCycleJobService $cycleJobService */
private $cycleJobService;
/** @var TaskMutexServiceInterface $taskMutexService */
private $taskMutexService;
/** @var SubscriptionCycleModuleInterface $subscriptionCycleModule */
private $subscriptionCycleModule;
/** @var SubscriptionModuleInterface $subscriptionModule */
private $subscriptionModule;
/** @var bool $useGroups */
private $useGroups;
/**
* SubscriptionCycleManualJobTask constructor.
*
* @param ApplicationCore $app
* @param Database $db
* @param SubscriptionCycleJobService $cycleJobService
* @param SubscriptionCycleModuleInterface $subscriptionCycleModule
* @param bool $useGroups
*/
/**
* SubscriptionCycleManualJobTask constructor.
*
* @param ApplicationCore $app
* @param Database $db
* @param TaskMutexServiceInterface $taskMutexService
* @param SubscriptionCycleJobService $cycleJobService
* @param SubscriptionModuleInterface $subscriptionModule
*/
public function __construct(
ApplicationCore $app,
Database $db,
TaskMutexServiceInterface $taskMutexService,
SubscriptionCycleJobService $cycleJobService,
SubscriptionCycleModuleInterface $subscriptionCycleModule,
SubscriptionModuleInterface $subscriptionModule,
bool $useGroups
SubscriptionModuleInterface $subscriptionModule
) {
$this->app = $app;
$this->db = $db;
$this->taskMutexService = $taskMutexService;
$this->cycleJobService = $cycleJobService;
$this->subscriptionCycleModule = $subscriptionCycleModule;
$this->subscriptionModule = $subscriptionModule;
$this->useGroups = $useGroups;
}
public function execute(): void
@ -71,77 +57,16 @@ final class SubscriptionCycleManualJobTask
}
$this->taskMutexService->setMutex('rechnungslauf_manual');
$jobs = $this->cycleJobService->listAll(100);
$simulatedDays = $this->getSimulatedDates($jobs);
if (empty($jobs)) {
return;
}
foreach (['auftrag', 'rechnung'] as $doctype) {
foreach ($simulatedDays as $simulatedDay) {
if ($simulatedDay === '') {
$simulatedDay = null;
} else {
try {
$simulatedDay = new DateTimeImmutable($simulatedDay);
} catch (Exception $exception) {
$simulatedDay = null;
}
}
$addresses = $this->getAddressesByTypeFromJobs($jobs, $doctype, $simulatedDay);
foreach ($jobs as $job) {
$job = $this->cycleJobService->getJob((int)$job['id']);
if (empty($job)) {
continue;
}
if ($job['document_type'] !== $doctype) {
continue;
}
if ($job['simulated_day'] === null && $simulatedDay !== null) {
continue;
}
if (
$job['simulated_day'] !== null
&& ($simulatedDay === null || $simulatedDay->format('Y-m-d') !== $job['simulated_day'])
) {
continue;
}
if (!in_array($job['address_id'], $addresses, false)) {
$this->cycleJobService->delete((int)$job['id']);
continue;
}
$simulatedDay = null;
if ($job['simulated_day'] !== null) {
try {
$simulatedDay = new DateTimeImmutable($job['simulated_day']);
} catch (Exception $exception) {
$simulatedDay = null;
}
}
if ($this->useGroups) {
$this->subscriptionCycleModule->generateAndSendSubscriptionCycleGroups(
$this->subscriptionModule,
[$job['address_id']],
$doctype,
$job['job_type'],
$job['printer_id'],
$simulatedDay
);
} else {
$this->subscriptionCycleModule->generateAndSendSubscriptionCycle(
$this->subscriptionModule,
[$job['address_id']],
$doctype,
$job['printer_id'],
$job['job_type'],
$simulatedDay
);
}
$this->cycleJobService->delete((int)$job['id']);
if ($this->taskMutexService->isTaskInstanceRunning('rechnungslauf')) {
return;
}
$this->taskMutexService->setMutex('rechnungslauf_manual');
}
}
foreach ($jobs as $job) {
switch ($job['document_type']) {
case 'rechnung':
$this->subscriptionModule->CreateInvoice((int)$job['address_id']);
break;
case 'auftrag':
$this->subscriptionModule->CreateOrder((int)$job['address_id']);
break;
}
$this->cycleJobService->delete((int)$job['id']);
}
}
@ -149,52 +74,4 @@ final class SubscriptionCycleManualJobTask
{
$this->taskMutexService->setMutex('rechnungslauf_manual', false);
}
/**
* @param array $jobs
* @param string $documentType
* @param DateTimeInterface|null $simulatedDay
*
* @return array
*/
private function getAddressesByTypeFromJobs(
array $jobs,
string $documentType,
?DateTimeInterface $simulatedDay = null
): array {
$addresses = [];
foreach ($jobs as $job) {
if ($job['document_type'] === $documentType) {
$addresses[] = (int)$job['address_id'];
}
}
if (empty($addresses)) {
return [];
}
$addressesWithSubscriptions = array_keys(
(array)$this->subscriptionModule->GetRechnungsArray($documentType, true)
);
return array_intersect($addresses, $addressesWithSubscriptions);
}
/**
* get all Dates from Setting "Vergangenes Datum für Abrechnungserstellung" to calc old Subscription cycles
*
* @param array $jobs
*
* @return array
*/
private function getSimulatedDates(array $jobs): array
{
$simulatedDates = [];
foreach ($jobs as $job) {
$simulatedDates[] = (string)$job['simulated_day'];
}
return array_unique($simulatedDates);
}
}

View File

@ -1,4 +1,9 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
* SPDX-FileCopyrightText: 2019 Xentral ERP Sorftware GmbH, Fuggerstrasse 11, D-86150 Augsburg
* SPDX-License-Identifier: LicenseRef-EGPL-3.1
*/
declare(strict_types=1);
@ -11,7 +16,7 @@ use Xentral\Modules\SubscriptionCycle\Exception\InvalidArgumentException;
final class SubscriptionCycleJobService
{
private $db;
private Database $db;
/**
* SubscriptionCycleJobService constructor.
@ -57,29 +62,27 @@ final class SubscriptionCycleJobService
* @param string $documentType
* @param string|null $jobType
* @param int|null $printerId
* @param DateTimeInterface|null $simulatedDay
*
* @throws InvalidArgumentException
*
* @return int
*/
public function create(int $addressId, string $documentType, ?string $jobType, ?int $printerId, ?DateTimeInterface $simulatedDay = null): int
public function create(int $addressId, string $documentType, ?string $jobType = null, ?int $printerId = null): int
{
$this->ensureDocumentType($documentType);
$this->db->perform(
'INSERT INTO `subscription_cycle_job`
(`address_id`, `document_type`, `job_type`, `printer_id`, `created_at`, `simulated_day`)
VALUES (:address_id, :document_type, :job_type, :printer_id, NOW(), :simulated_day)',
(`address_id`, `document_type`, `job_type`, `printer_id`, `created_at`)
VALUES (:address_id, :document_type, :job_type, :printer_id, NOW())',
[
'address_id' => $addressId,
'document_type' => $documentType,
'job_type' => $jobType,
'printer_id' => $printerId,
'simulated_day' => $simulatedDay === null ? null : $simulatedDay->format('Y-m-d'),
]
);
return (int)$this->db->lastInsertId();
return $this->db->lastInsertId();
}
/**

View File

@ -0,0 +1,115 @@
<?php
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
* SPDX-License-Identifier: LicenseRef-EGPL-3.1
*/
namespace Xentral\Modules\SubscriptionCycle;
use ApplicationCore;
use DateTimeImmutable;
use DateTimeInterface;
use Xentral\Components\Database\Database;
class SubscriptionModule implements SubscriptionModuleInterface
{
private ApplicationCore $app;
private Database $db;
public function __construct(ApplicationCore $app, Database $db)
{
$this->app = $app;
$this->db = $db;
}
public function GetPositions(int $address, string $documentType, DateTimeInterface $calculationDate = null): array
{
if ($calculationDate === null)
$calculationDate = new DateTimeImmutable('today');
$sql = "SELECT
aa.id,
@start := GREATEST(aa.startdatum, aa.abgerechnetbis) as start,
@end := IF(aa.enddatum = '0000-00-00' OR aa.enddatum > :calcdate, :calcdate, aa.enddatum) as end,
@cycles := GREATEST(aa.zahlzyklus, CASE
WHEN aa.preisart = 'monat' THEN
TIMESTAMPDIFF(MONTH, @start, @end)
WHEN aa.preisart = 'jahr' THEN
TIMESTAMPDIFF(YEAR, @start, @end)
WHEN aa.preisart = '30tage' THEN
FLOOR(TIMESTAMPDIFF(DAY, @start, @end) / 30)
END+1) as cycles,
CASE
WHEN aa.preisart = 'monat' THEN
DATE_ADD(@start, INTERVAL @cycles MONTH)
WHEN aa.preisart = 'jahr' THEN
DATE_ADD(@start, INTERVAL @cycles YEAR)
WHEN aa.preisart = '30tage' THEN
DATE_ADD(@start, INTERVAL @cycles*30 DAY )
END as newend,
aa.preisart,
aa.adresse,
aa.preis,
aa.rabatt,
aa.bezeichnung,
aa.beschreibung,
aa.artikel,
aa.menge,
aa.waehrung
FROM abrechnungsartikel aa
JOIN artikel a on aa.artikel = a.id
WHERE aa.dokument = :doctype
AND greatest(aa.startdatum, aa.abgerechnetbis) <= :calcdate
AND (aa.enddatum = '0000-00-00' OR aa.abgerechnetbis < aa.enddatum)
AND aa.adresse = :address";
return $this->db->fetchAll($sql, [
'doctype' => $documentType,
'calcdate' => $calculationDate->format('Y-m-d'),
'address' => $address]);
}
public function CreateInvoice(int $address, DateTimeInterface $calculationDate = null) {
$positions = $this->GetPositions($address, 'rechnung', $calculationDate);
if(empty($positions))
return;
$invoice = $this->app->erp->CreateRechnung($address);
$this->app->erp->LoadRechnungStandardwerte($invoice, $address);
foreach ($positions as $pos) {
$beschreibung = $pos['beschreibung'];
$starts = DateTimeImmutable::createFromFormat('Y-m-d', $pos['start'])->format('d.m.Y');
$newends = DateTimeImmutable::createFromFormat('Y-m-d', $pos['newend'])->format('d.m.Y');
$beschreibung .= "<br>Zeitraum: $starts - $newends";
$this->app->erp->AddRechnungPositionManuell($invoice, $pos['artikel'], $pos['preis'],
$pos['menge']*$pos['cycles'], $pos['bezeichnung'], $beschreibung, $pos['waehrung'], $pos['rabatt']);
$this->db->exec("UPDATE abrechnungsartikel SET abgerechnetbis='{$pos['newend']}' WHERE id={$pos['id']}");
}
$this->app->erp->RechnungNeuberechnen($invoice);
//$this->app->erp->BelegFreigabe('rechnung', $invoice);
}
public function CreateOrder(int $address, DateTimeInterface $calculationDate = null) {
$positions = $this->GetPositions($address, 'auftrag', $calculationDate);
if(empty($positions))
return;
$orderid = $this->app->erp->CreateAuftrag($address);
$this->app->erp->LoadAuftragStandardwerte($orderid, $address);
foreach ($positions as $pos) {
$beschreibung = $pos['beschreibung'];
$starts = DateTimeImmutable::createFromFormat('Y-m-d', $pos['start'])->format('d.m.Y');
$newends = DateTimeImmutable::createFromFormat('Y-m-d', $pos['newend'])->format('d.m.Y');
$beschreibung .= "<br>Zeitraum: $starts - $newends";
$this->app->erp->AddAuftragPositionManuell($orderid, $pos['artikel'], $pos['preis'],
$pos['menge']*$pos['cycles'], $pos['bezeichnung'], $beschreibung, $pos['waehrung'], $pos['rabatt']);
$this->db->exec("UPDATE abrechnungsartikel SET abgerechnetbis='{$pos['newend']}' WHERE id={$pos['id']}");
}
$this->app->erp->AuftragNeuberechnen($orderid);
//$this->app->erp->BelegFreigabe('auftrag', $orderid);
}
}

View File

@ -1,6 +1,8 @@
<?php
declare(strict_types=1);
/*
* SPDX-FileCopyrightText: 2022 Andreas Palm
* SPDX-License-Identifier: LicenseRef-EGPL-3.1
*/
namespace Xentral\Modules\SubscriptionCycle;
@ -8,36 +10,7 @@ use DateTimeInterface;
interface SubscriptionModuleInterface
{
/**
* @param int $customer
* @param string $documentType
*
* @return mixed
*/
public function RechnungKunde($customer, $documentType);
/**
* @param $customer
* @param $invoiceGroupKey
* @param $key
*
* @return mixed
*/
public function AuftragImportAbo($customer, $invoiceGroupKey, $key);
/**
* @param $customer
* @param $invoiceGroupKey
* @param $key
*
* @return mixed
*/
public function RechnungImportAbo($customer, $invoiceGroupKey, $key);
/**
* @param string $documentType
*
* @return array|null
*/
public function GetRechnungsArray($documentType);
public function CreateInvoice(int $address, DateTimeInterface $calculationDate = null);
public function CreateOrder(int $address, DateTimeInterface $calculationDate = null);
public function GetPositions(int $address, string $documentType, DateTimeInterface $calculationDate = null): array;
}

View File

@ -145,8 +145,11 @@ final class SystemMailer
$email = new EmailMessage($subject, $body, $recipients, $ccs, $bccs);
foreach ($attachFiles as $file) {
$this->logger->debug("Attaching file", ['filename' => $file]);
if ($file !== null && file_exists($file)) {
$email->addAttachment(new FileAttachment($file));
} else {
$this->logger->debug("Attaching file failed", ['filename' => $file]);
}
}

View File

@ -22,12 +22,22 @@ class TicketFormatter
*/
public function encodeToUtf8(string $string): string
{
$encoding = mb_detect_encoding($string, 'UTF-8, ISO-8859-1, ISO-8859-15', true);
return mb_convert_encoding(
$converted = mb_convert_encoding(
$string,
'UTF-8',
$encoding
'auto'
);
// Fallback
if ($converted === false) {
$converted = mb_convert_encoding(
$string,
'UTF-8',
'iso-8859-1'
);
}
return ($converted);
}
}

File diff suppressed because it is too large Load Diff

View File

@ -30,10 +30,10 @@ $factoryServiceMap = @include $serviceCacheFile;
if (!is_file($serviceCacheFile)) {
// Installer ausführen wenn ServiceMap nicht vorhanden ist
// Installer ausführen, wenn ServiceMap nicht vorhanden ist
$resolver = new Psr4ClassNameResolver();
$resolver->addNamespace('Xentral\\', __DIR__);
$resolver->excludeFile(__DIR__ . '/bootstrap.php');
$resolver->excludeFile(__DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php');
$generator = new ClassMapGenerator($resolver, __DIR__);
$installer = new Installer($generator, $resolver);

View File

@ -12,7 +12,7 @@
class Config
{
/** @var string */
public $updateHost = 'update.xentral.biz';
public $updateHost = 'removed.upgrade.host';
public function __construct()
{

View File

@ -0,0 +1,114 @@
<?php
/*
include(dirname(__FILE__)."/../conf/main.conf.php");
include(dirname(__FILE__)."/../phpwf/plugins/class.mysql.php");
include(dirname(__FILE__)."/../www/lib/imap.inc.php");
include(dirname(__FILE__)."/../www/lib/class.erpapi.php");
class app_t {
var $DB;
var $user;
}
*/
// ende debug
/*
$debugfile = "/var/www/html/Xenomporio/debug.txt";
function file_append($filename,$text) {
$oldtext = file_get_contents($filename);
file_put_contents($filename,$oldtext.$text);
}
file_put_contents($debugfile,"1");
*/
if(empty($app)){
$app = new app_t();
}
$DEBUG = 0;
if(empty($app->Conf)){
$conf = new Config();
$app->Conf = $conf;
}
if(empty($app->DB) || empty($app->DB->connection)){
$app->DB = new DB($app->Conf->WFdbhost, $app->Conf->WFdbname, $app->Conf->WFdbuser, $app->Conf->WFdbpass, null, $app->Conf->WFdbport);
}
if(empty($app->erp)){
if(class_exists('erpAPICustom')){
$erp = new erpAPICustom($app);
}else{
$erp = new erpAPI($app);
}
$app->erp = $erp;
}
$app->String = new WawiString();
if(class_exists('RemoteCustom'))
{
$app->remote = new RemoteCustom($app);
}else{
$app->remote = new Remote($app);
}
$app->Secure = new Secure($app);
$app->User = new User($app);
if(!defined('FPDF_FONTPATH'))
{
define('FPDF_FONTPATH',dirname(__DIR__) . '/www/lib/pdf/font/');
}
$cronjobname = 'autoversand_manuell';
$mutex = $app->DB->Select(
"SELECT MAX(`mutex`) FROM `prozessstarter` WHERE (`parameter` = '".$cronjobname."')"
);
if($mutex){
$app->DB->Update(
"UPDATE `prozessstarter`
SET `mutexcounter`=`mutexcounter`+1
WHERE `mutex` = 1 AND (`parameter` = '".$cronjobname."')"
);
file_append($debugfile,"MUTEX");
return;
}
$app->DB->Update(
"UPDATE `prozessstarter` SET `mutex`='1', `mutexcounter` = 0 WHERE (`parameter` = '".$cronjobname."')"
);
// START APPLICATION
$objAuftrag = $app->loadModule('auftrag');
if($objAuftrag == null || !method_exists($objAuftrag, 'AuftragVersand')) {
$app->erp->LogFile($cronjobname." failed. Error while loading module 'auftrag'.");
exit;
}
$pendingorders = $app->DB->SelectArr(
"SELECT id
FROM auftrag AS a
WHERE a.id!='' AND (a.belegnr!=0 OR a.belegnr!='')
AND a.status='freigegeben' AND a.cronjobkommissionierung > 0"
);
if (!is_null($pendingorders)) {
$processed_orders_num = 0;
foreach ($pendingorders as $pendingorder) {
/* Process each order */
if($objAuftrag->AuftragVersand($pendingorder['id'],true)) { // Ignore shipdate -> The order has been marked, send it
$processed_orders_num++;
} else {
}
// Limit to 10 per call
if ($processed_orders_num > 10) {
break;
}
}
}
// END APPLICATION
$app->DB->Update("UPDATE prozessstarter SET mutex = 0 , mutexcounter = 0, letzteausfuerhung = now() WHERE (parameter = '".$cronjobname."' ) AND aktiv = 1");

View File

@ -421,7 +421,7 @@ function GetHtmlMessage($receipientName, $messageTotalCount, $messages = [])
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>[Xenomporio] Ungelesene Chat-Nachrichten</title>
<title>[OpenXE] Ungelesene Chat-Nachrichten</title>
<style type="text/css">
body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; width: 100%; max-width: 100%; font-size: 17px; line-height: 24px; color: #48494B; background: #F5F5F5; }
h1, h2, h3, h4 { color: #42B8C4; margin-bottom: 12px; line-height: 26px; }

View File

@ -223,7 +223,7 @@ if ($task) {
} catch (Exception $e) {
$app->erp->LogFile(
$app->DB->real_escape_string(
'Prozessstarter Fehler bei Aufruf des Moduls ' . $task[$task_index]['parameter'] . ': ' . $e->getMessage()
'Prozessstarter Fehler bei Aufruf des Moduls ' . $task[$task_index]['parameter'] . ': ' . $e->getMessage()." Trace: ".$e->GetTraceAsString()
)
);
}

View File

@ -1,16 +0,0 @@
<?php
/* Copyright (c) 2022 Xenomporio project */
/*
Refresh the githash number in githash.txt
*/
$path = '../.git/';
if (!is_dir($path)) {
return;
}
$head = trim(substr(file_get_contents($path . 'HEAD'), 4));
$hash = trim(file_get_contents(sprintf($path . $head)));
if (!empty($hash)) {
file_put_contents("../githash.txt", $hash);
}
?>

View File

@ -34,7 +34,7 @@ if(empty($app->remote)) {
$app->remote = new Remote($app);
}
}
$app->erp->LogFile("Starte Synchronisation");
$app->erp->LogFile("Lagerzahlen-Synchronisation Start");
//$app->DB->Update("UPDATE artikel SET cache_lagerplatzinhaltmenge='999'");
@ -53,6 +53,9 @@ $firmendatenid = $app->DB->Select("SELECT MAX(id) FROM firmendaten LIMIT 1");
$shops = $app->DB->SelectArr('SELECT * FROM `shopexport` WHERE `aktiv` = 1');
if(empty($shops)) {
$app->erp->LogFile("Lagerzahlen-Synchronisation Ende: Keine aktiven Shops");
return;
}
$shopByIds = [];
@ -97,6 +100,9 @@ $firmendatenid = $app->DB->Select("SELECT MAX(id) FROM firmendaten LIMIT 1");
);
if(empty($lagerartikel)) {
$app->erp->LogFile("Lagerzahlen-Synchronisation Ende: Keine fälligen Artikel");
return;
}
@ -110,7 +116,7 @@ $firmendatenid = $app->DB->Select("SELECT MAX(id) FROM firmendaten LIMIT 1");
}
$clagerartikel = $lagerartikel?count($lagerartikel):0;
$app->erp->LogFile('Artikel Gesamt fuer Synchronisation: '.$clagerartikel);
$app->erp->LogFile('Lagerzahlen-Synchronisation, Artikel gesamt: '.$clagerartikel);
foreach($lagerartikel as $ij => $articleId) {
$app->DB->Update(
"UPDATE `prozessstarter`
@ -119,9 +125,9 @@ $firmendatenid = $app->DB->Select("SELECT MAX(id) FROM firmendaten LIMIT 1");
);
try {
if($anzargs > 2){
$message .= $app->erp->LagerSync($articleId, true, $shopByIds);
$message .= $app->erp->LagerSync($articleId, false, $shopByIds); // 2nd parameter is print_echo -> prints via echo to logfile (big print_r)
}else{
$message .= $app->erp->LagerSync($articleId, true);
$message .= $app->erp->LagerSync($articleId, false);
}
}
catch (Exception $exception) {
@ -172,9 +178,10 @@ $firmendatenid = $app->DB->Select("SELECT MAX(id) FROM firmendaten LIMIT 1");
}
}
catch (Exception $exception) {
$app->erp->LogFile($app->DB->real_escape_string($exception->getMessage()));
$app->erp->LogFile("Lagerzahlen-Synchronisation Exception:".$app->DB->real_escape_string($exception->getMessage()));
}
}
$app->erp->LogFile('Ende Synchronisation');
$app->erp->LogFile("Lagerzahlen-Synchronisation Ende");

171
cronjobs/tickets.php Normal file
View File

@ -0,0 +1,171 @@
<?php
/*
* Fetch all mails for accounts with ticket function
* Create tickets or sort mails to existing tickets
*/
use Xentral\Components\Logger\Logger;
use Xentral\Components\MailClient\MailClientFactory;
use Xentral\Modules\SystemMailClient\MailClientConfigProvider;
use Xentral\Modules\SystemMailer\Service\EmailAccountGateway;
use Xentral\Modules\Ticket\Importer\TicketFormatter;
use Xentral\Modules\Ticket\Task\TicketImportHelperFactory;
$DEBUG = 0;
/*
$debugfile = "/var/www/html/Xenomporio/debug.txt";
function file_append($filename,$text) {
$oldtext = file_get_contents($filename);
file_put_contents($filename,$oldtext.$text);
}
file_put_contents($debugfile,"0");
*/
/** @var ApplicationCore $app */
$erp = $app->erp;
$conf = $app->Conf;
/** @var Logger $logger */
$logger = $app->Container->get('Logger');
$cronjobname = 'tickets';
/*
$mutex = $app->DB->Select(
"SELECT MAX(`mutex`) FROM `prozessstarter` WHERE (`parameter` = '".$cronjobname."')"
);
if($mutex){
$app->DB->Update(
"UPDATE `prozessstarter`
SET `mutexcounter`=`mutexcounter`+1
WHERE `mutex` = 1 AND (`parameter` = '".$cronjobname."')"
);
return;
}
$app->DB->Update(
"UPDATE `prozessstarter` SET `mutex`='1', `mutexcounter` = 0 WHERE (`parameter` = '".$cronjobname."')"
);
*/
// get all email Accounts that have the ticket system active
/** @var EmailAccountGateway $accountGateway */
$accountGateway = $app->Container->get('EmailAccountGateway');
$accounts = $accountGateway->getAccountsWithTicketActive();
// only load services if there is at least one account to import (performance)
$ticketModule = null;
$factory = null;
$configProvider = null;
$formatHelper = null;
$importHelperFactory = null;
if(!empty($accounts)){
/** @var Ticket $ticketModule */
$ticketModule = $app->erp->LoadModul('ticket');
/** @var MailClientFactory $factory */
$factory = $app->Container->get('MailClientFactory');
/** @var MailClientConfigProvider $configProvider */
$configProvider = $app->Container->get('MailClientConfigProvider');
/** @var TicketFormatter $formatHelper */
$formatHelper = $app->Container->get('TicketFormatter');
/** @var TicketImportHelperFactory $importHelperFactory */
$importHelperFactory = $app->Container->get('TicketImportHelperFactory');
}
$totalEmailsImportCount = 0;
foreach ($accounts as $account) {
$logger->debug(
'Start imap ticket import for {email}',
['email' => $account->getEmailAddress(), 'account' => $account]
);
// create mail client
try {
$mailConfig = $configProvider->createImapConfigFromAccount($account);
$mailClient = $factory->createImapClient($mailConfig);
} catch (Exception $e) {
$logger->error('Failed to create email client', ['error' => (string)$e, 'account' => $account]);
continue;
}
// connect mail client
try {
$mailClient->connect();
} catch (Exception $e) {
$logger->error('Error during imap connection', ['error' => (string)$e, 'account' => $account]);
continue;
}
// connet to INBOX folder
try {
$mailClient->selectFolder('INBOX');
} catch (Exception $e) {
$logger->error('Failed to select INBOX folder', ['error' => (string)$e, 'account' => $account]);
continue;
}
$projectId = $account->getProjectId() > 0 ? $account->getProjectId() : 1;
$delete_msg = 0;
$daysold = $account->getBackupDeleteAfterDays();
// determine search criteria for new messages
$datet = '2012-12-24';
if ($account->getImportStartDateAsString() !== '0000-00-00') {
$datesince = date('d-M-Y', strtotime($account->getImportStartDateAsString()));
$criteria = 'UNSEEN SINCE ' . $datesince;
} else {
$criteria = 'UNSEEN';
}
// search new messages
try {
$searchResult = $mailClient->searchMessages($criteria);
} catch (Exception $e) {
$logger->error('Error during imap search', ['exception' => $e]);
continue;
}
$logger->debug('unread emails to import: {message_count}', ['message_count' => count($searchResult)]);
// set mutex if there is more than 5 emails to import
if (count($searchResult) > 5) {
$app->DB->Update(
"UPDATE `prozessstarter`
SET `mutex`=1, `mutexcounter` = 0, `letzteausfuerhung` = NOW()
WHERE (`parameter` = '".$cronjobname."')"
);
}
$importer = $importHelperFactory->create($mailClient, $account, $projectId);
$insertedMailsCount = $importer->importMessages($searchResult); // TicketImportHelper->importMessages()
$totalEmailsImportCount += $insertedMailsCount;
// set mutex if the total amount of imported emails is more than 10
if ($totalEmailsImportCount > 10) {
$app->DB->Update(
"UPDATE `prozessstarter`
SET `mutex`=1, `mutexcounter` = 0, `letzteausfuerhung` = NOW()
WHERE (`parameter` = '".$cronjobname."')"
);
}
$mailClient->expunge();
$mailClient->disconnect();
if (
method_exists($app->erp, 'canRunCronjob')
&& !$app->erp->canRunCronjob(['supportmails', 'tickets'])
) {
$logger->error('Tickets error');
return;
}
$app->DB->Update(
"UPDATE `prozessstarter`
SET `mutex`=1, `mutexcounter` = 0, `letzteausfuerhung` = NOW()
WHERE (`parameter` = '".$cronjobname."')"
);
}
$app->DB->Update(
"UPDATE `prozessstarter` SET `mutex`=0,`mutexcounter`=0 WHERE (`parameter` = '".$cronjobname."')"
);

View File

@ -9571,7 +9571,7 @@ CREATE TABLE IF NOT EXISTS `produktion` (
`angebot` varchar(255) NOT NULL,
`freitext` text NOT NULL,
`internebemerkung` text NOT NULL,
`status` varchar(64) NOT NULL,
`status` varchar(64) NOT NULL default 'angelegt',
`adresse` int(11) NOT NULL,
`name` varchar(255) NOT NULL,
`abteilung` varchar(255) NOT NULL,
@ -10365,7 +10365,7 @@ CREATE TABLE IF NOT EXISTS `proformarechnung_protokoll` (
CREATE TABLE IF NOT EXISTS `projekt` (
`id` int(10) NOT NULL AUTO_INCREMENT,
`name` text NOT NULL,
`abkuerzung` text NOT NULL,
`abkuerzung` varchar(128) NOT NULL,
`verantwortlicher` text NOT NULL,
`beschreibung` text NOT NULL,
`sonstiges` text NOT NULL,
@ -14355,16 +14355,16 @@ CREATE TABLE IF NOT EXISTS `ticket_nachricht` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`ticket` varchar(255) NOT NULL,
`verfasser` varchar(255) NOT NULL,
`bearbeiter` varchar(255) NOT NULL,
`bearbeiter` varchar(255) NOT NULL DEFAULT '',
`mail` varchar(255) NOT NULL,
`zeit` datetime NOT NULL,
`zeitausgang` datetime NOT NULL,
`zeitausgang` datetime NULL,
`text` longtext NOT NULL,
`textausgang` longtext NOT NULL,
`textausgang` longtext NOT NULL DEFAULT '',
`betreff` varchar(255) NOT NULL,
`bemerkung` text NOT NULL,
`bemerkung` text NOT NULL DEFAULT '',
`medium` varchar(255) NOT NULL,
`versendet` varchar(255) NOT NULL,
`versendet` varchar(255) NOT NULL DEFAULT '',
`status` varchar(64) NOT NULL,
`mail_cc` varchar(128) NOT NULL DEFAULT '',
`verfasser_replyto` varchar(255) NOT NULL,
@ -15208,6 +15208,7 @@ CREATE TABLE IF NOT EXISTS `verbindlichkeit` (
`klaergrund` varchar(255) NOT NULL DEFAULT '',
`skonto_erhalten` decimal(10,2) NOT NULL DEFAULT '0.00',
`kurs` decimal(18,8) NOT NULL DEFAULT '0.00000000',
`sprache` varchar(25) NOT NULL DEFAULT '',
PRIMARY KEY (`id`),
KEY `adresse` (`adresse`),
KEY `bestellung` (`bestellung`)
@ -16727,7 +16728,11 @@ INSERT INTO `firmendaten_werte` (`id`, `name`, `typ`, `typ1`, `typ2`, `wert`, `d
(385, 'cleaner_shopimport', 'tinyint', '1', '', '1', '1', 0, 0),
(386, 'cleaner_shopimport_tage', 'int', '11', '', '90', '90', 0, 0),
(387, 'cleaner_adapterbox', 'tinyint', '1', '', '1', '1', 0, 0),
(388, 'cleaner_adapterbox_tage', 'int', '11', '', '90', '90', 0, 0);
(388, 'cleaner_adapterbox_tage', 'int', '11', '', '90', '90', 0, 0),
(389, 'bcc3', 'varchar', '128', '', '', '', 0, 0),
(390, 'rechnungersatz_standard', 'int', '1', '', '0', '0', 0, 0)
;
INSERT INTO `geschaeftsbrief_vorlagen` (`id`, `sprache`, `betreff`, `text`, `subjekt`, `projekt`, `firma`) VALUES
(1, 'deutsch', 'Bestellung {BELEGNR} von {FIRMA}', '{ANSCHREIBEN},<br><br>anbei übersenden wir Ihnen unsere Bestellung zu. Bitte senden Sie uns als Bestätigung für den Empfang eine Auftragsbestätigung zu.', 'Bestellung', 1, 1),
@ -16746,6 +16751,44 @@ INSERT INTO `geschaeftsbrief_vorlagen` (`id`, `sprache`, `betreff`, `text`, `sub
(16, 'deutsch', 'Zusammenstellung Ihrer Bestellung', '{ANSCHREIBEN},<br><br>soeben wurde Ihr Bestellung zusammengestellt. Sie können Ihre Ware jetzt abholen. Sind Sie bereits bei uns gewesen, so sehen Sie diese E-Mail bitte als gegenstandslos an.<br><br>{VERSAND}<br><br>Ihr {FIRMA} Team<br>', 'Selbstabholer', 0, 1),
(17, 'deutsch', 'Ihre Gutschrift {BELEGNR} von {FIRMA}', '{ANSCHREIBEN},<br><br>anbei finden Sie Ihre Gutschrift. Gerne stehen wir Ihnen weiterhin zur Verfügung.<br><br>Ihre Gutschrift ist im PDF-Format erstellt worden. Um sich die Gutschrift ansehen zu können, klicken Sie auf den Anhang und es öffnet sich automatisch der Acrobat Reader. Sollten Sie keinen Acrobat Reader besitzen, haben wir für Sie den Link zum kostenlosen Download von Adobe Acrobat Reader mit angegeben. Er führt Sie automatisch auf die Downloadseite von Adobe. So können Sie sich Ihre Gutschrift auch für Ihre Unterlagen ausdrucken.<br><br>http://www.adobe.com/products/acrobat/readstep2.html<br><br>{IF}{INTERNET}{THEN}Internet-Bestellnr.: {INTERNET}{ELSE}{ENDIF}', 'Gutschrift', 1, 1);
/* DBXE 2024-01-24 für datatablelabel */
INSERT INTO `hook` (`name`, `aktiv`, `parametercount`, `alias`, `description`) VALUES
('eproosystem_ende', 1, 0, '', ''),
('parseuservars', 1, 0, '', ''),
('dokumentsend_ende', 1, 0, '', ''),
('auftrag_versand_ende', 1, 0, '', ''),
('transfer_document_incoming', 1, 0, '', '')
;
INSERT INTO `hook_register` (`hook_action`, `function`, `aktiv`, `position`, `hook`, `module`, `module_parameter`) VALUES
(0, 'DataTableLabelsInclude', 1, 3, (SELECT id FROM hook WHERE name = 'eproosystem_ende'), 'Datatablelabels', 0),
(0, 'DatatablelabelsParseUserVars', 1, 2, (SELECT id FROM hook WHERE name = 'parseuservars'), 'Datatablelabels', 0),
(0, 'DataTableLabelsDokumentSendHook', 1, 1, (SELECT id FROM hook WHERE name = 'dokumentsend_ende'), 'Datatablelabels', 0),
(0, 'DatatablelabelsOrderSent', 1, 1, (SELECT id FROM hook WHERE name = 'auftrag_versand_ende'), 'Datatablelabels', 0),
(0, 'DatatablelabelsTransferDocumentIncomming', 1, 1, (SELECT id FROM hook WHERE name = 'transfer_document_incoming'), 'Datatablelabels', 0);
/* DBXE 2024-01-24 für datatablelabel */
/* OpenXE 2024-02-03 für belegvorlagen */
INSERT INTO `hook` (`name`, `aktiv`, `parametercount`, `alias`, `description`) VALUES
('BelegPositionenButtons', 1, 3, '', ''),
('AARLGPositionen_cmds_end', 1, 1, '', ''),
('ajax_filter_hook1', 1, 1, '', '');
INSERT INTO `hook_register` (`hook_action`, `function`, `aktiv`, `position`, `hook`, `module`, `module_parameter`) VALUES
(0, 'BelegevorlagenAARLGPositionen_cmds_end', 1, 2, (SELECT id FROM hook WHERE name = 'AARLGPositionen_cmds_end' LIMIT 1), 'belegevorlagen', 0),
(0, 'Belegevorlagenajax_filter_hook1', 1, 2, (SELECT id FROM hook WHERE name = 'ajax_filter_hook1' LIMIT 1), 'belegevorlagen', 0),
(0, 'BelegevorlagenBelegPositionenButtons', 1, 2, (SELECT id FROM hook WHERE name = 'BelegPositionenButtons' LIMIT 1), 'belegevorlagen', 0)
;
/* DBXE 2024-02-03 für belegvorlagen */
/*
BelegPositionenButtons
Id,Hook_action,Function,Aktiv,Position,Hook,Module,Module_parameter
20,0,BelegevorlagenBelegPositionenButtons,1,2,16,belegevorlagen,0
*/
INSERT INTO `hook_menu` (`id`, `module`, `aktiv`) VALUES
(1, 'artikel', 1),
(2, 'provisionenartikel', 1),
@ -16797,8 +16840,8 @@ INSERT INTO `prozessstarter` (`id`, `bezeichnung`, `bedingung`, `art`, `startzei
(6, 'Überzahlte Rechnungen', '', 'uhrzeit', '2015-10-25 23:00:00', '0000-00-00 00:00:00', '', 'cronjob', 'ueberzahlterechnungen', 0, 0, 0, 1, ''),
(7, 'Umsatzstatistik', '', 'uhrzeit', '2015-10-25 23:30:00', '0000-00-00 00:00:00', '', 'cronjob', 'umsatzstatistik', 0, 0, 0, 1, ''),
(8, 'Paketmarken Tracking Download', '', 'uhrzeit', '2015-10-25 14:00:00', '0000-00-00 00:00:00', '', 'cronjob', 'wgettracking', 0, 0, 0, 1, ''),
(9, 'Chat-Benachrichtigung', '', 'periodisch', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '60', 'cronjob', 'chat', 0, 0, 0, 1, ''),
(10, 'Git Revision einlesen', '', 'periodisch', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '120', 'cronjob', 'githash', 1, 0, 0, 1, '');
(9, 'Lagerhistorie', '', 'uhrzeit', '2015-10-25 00:00:00', '0000-00-00 00:00:00', '', 'cronjob', 'lagerwert', 0, 0, 0, 1, ''),
(10, 'Chat-Benachrichtigung', '', 'periodisch', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '60', 'cronjob', 'chat', 0, 0, 0, 1, '');
INSERT INTO `user` (`id`, `username`, `password`, `repassword`, `description`, `settings`, `parentuser`, `activ`, `type`, `adresse`, `fehllogins`, `standarddrucker`, `firma`, `logdatei`, `startseite`, `hwtoken`, `hwkey`, `hwcounter`, `motppin`, `motpsecret`, `passwordmd5`, `externlogin`, `projekt_bevorzugen`, `email_bevorzugen`, `projekt`, `rfidtag`, `vorlage`, `kalender_passwort`, `kalender_ausblenden`, `kalender_aktiv`, `gpsstechuhr`, `standardetikett`, `standardfax`, `internebezeichnung`, `hwdatablock`, `standardversanddrucker`, `passwordsha512`, `salt`) VALUES
(1, 'admin', 'qnvEQ1sFWNdIg', 0, 'Administrator', 'firstinstall', 0, 1, 'admin', 1, 0, 0, 1, '2016-08-05 08:34:59', NULL, NULL, NULL, NULL, NULL, NULL, '21232f297a57a5a743894a0e4a801fc3', 1, 0, 1, 0, '', NULL, NULL, 0, NULL, NULL, 0, 0, NULL, NULL, 0, '', '');
@ -18167,7 +18210,7 @@ INSERT INTO `wiedervorlage_stages` (`id`, `kurzbezeichnung`, `name`, `hexcolor`,
(12, 'Stay', 'Stay (Erhalt)', '#A2D624', 0, 1, 4, 4, NULL),
(13, 'Okay', 'Okay (Befürwortung)', '#A2D624', 0, 1, 5, 4, NULL);
INSERT INTO `wiki` (`id`, `name`, `content`, `lastcontent`) VALUES
(1, 'StartseiteWiki', '\n<p>Herzlich Willkommen in Ihrem Xenomporio, dem freien ERP.<br><br>Wir freuen uns Sie als Benutzer begrüßen zu dürfen. Mit Xenomporio organisieren Sie Ihre Firma schnell und einfach. Sie haben alle wichtigen Zahlen und Vorgänge im Überblick.<br><br>Für Einsteiger sind die folgenden Themen wichtig:<br><br></p>\n<ul>\n<li> <a href="index.php?module=firmendaten&amp;action=edit" target="_blank"> Firmendaten</a> (dort richten Sie Ihr Briefpapier ein)</li>\n<li> <a href="index.php?module=adresse&amp;action=list" target="_blank"> Stammdaten / Adressen</a> (Kunden und Lieferanten anlegen)</li>\n<li> <a href="index.php?module=artikel&amp;action=list" target="_blank"> Artikel anlegen</a> (Ihr Artikelstamm)</li>\n<li> <a href="index.php?module=angebot&amp;action=list" target="_blank"> Angebot</a> / <a href="index.php?module=auftrag&amp;action=list" target="_blank"> Auftrag</a> (Alle Dokumente für Ihr Geschäft)</li>\n<li> <a href="index.php?module=rechnung&amp;action=list" target="_blank"> Rechnung</a> / <a href="index.php?module=gutschrift&amp;action=list" target="_blank"> Gutschrift</a></li>\n<li> <a href="index.php?module=lieferschein&amp;action=list" target="_blank"> Lieferschein</a></li>\n</ul>\n<p><br><br>Kennen Sie unsere Zusatzmodule die Struktur und Organisation in das tägliche Geschäft bringen?<br><br></p>\n<ul>\n<li> <a href="index.php?module=kalender&amp;action=list" target="_blank"> Kalender</a></li>\n<li> <a href="index.php?module=wiki&amp;action=list" target="_blank"> Wiki</a></li>\n</ul>', NULL);
(1, 'StartseiteWiki', '\n<p>Herzlich Willkommen in Ihrem DBXE, dem freien ERP.<br><br>Wir freuen uns Sie als Benutzer begrüßen zu dürfen. Mit DBXE organisieren Sie Ihre Firma schnell und einfach. Sie haben alle wichtigen Zahlen und Vorgänge im Überblick.<br><br>Für Einsteiger sind die folgenden Themen wichtig:<br><br></p>\n<ul>\n<li> <a href="index.php?module=firmendaten&amp;action=edit" target="_blank"> Firmendaten</a> (dort richten Sie Ihr Briefpapier ein)</li>\n<li> <a href="index.php?module=adresse&amp;action=list" target="_blank"> Stammdaten / Adressen</a> (Kunden und Lieferanten anlegen)</li>\n<li> <a href="index.php?module=artikel&amp;action=list" target="_blank"> Artikel anlegen</a> (Ihr Artikelstamm)</li>\n<li> <a href="index.php?module=angebot&amp;action=list" target="_blank"> Angebot</a> / <a href="index.php?module=auftrag&amp;action=list" target="_blank"> Auftrag</a> (Alle Dokumente für Ihr Geschäft)</li>\n<li> <a href="index.php?module=rechnung&amp;action=list" target="_blank"> Rechnung</a> / <a href="index.php?module=gutschrift&amp;action=list" target="_blank"> Gutschrift</a></li>\n<li> <a href="index.php?module=lieferschein&amp;action=list" target="_blank"> Lieferschein</a></li>\n</ul>\n<p><br><br>Kennen Sie unsere Zusatzmodule die Struktur und Organisation in das tägliche Geschäft bringen?<br><br></p>\n<ul>\n<li> <a href="index.php?module=kalender&amp;action=list" target="_blank"> Kalender</a></li>\n<li> <a href="index.php?module=wiki&amp;action=list" target="_blank"> Wiki</a></li>\n</ul>', NULL);
INSERT INTO `konten` (`id`, `bezeichnung`, `kurzbezeichnung`, `type`, `erstezeile`, `datevkonto`, `blz`, `konto`, `swift`, `iban`, `lastschrift`, `hbci`, `hbcikennung`, `inhaber`, `aktiv`, `keineemail`, `firma`, `schreibbar`, `importletztenzeilenignorieren`, `liveimport`, `liveimport_passwort`, `liveimport_online`, `importtrennzeichen`, `codierung`, `importerstezeilenummer`, `importdatenmaskierung`, `importnullbytes`, `glaeubiger`, `geloescht`, `projekt`, `saldo_summieren`, `saldo_betrag`, `saldo_datum`, `importfelddatum`, `importfelddatumformat`, `importfelddatumformatausgabe`, `importfeldbetrag`, `importfeldbetragformat`, `importfeldbuchungstext`, `importfeldbuchungstextformat`, `importfeldwaehrung`, `importfeldwaehrungformat`, `importfeldhabensollkennung`, `importfeldkennunghaben`, `importfeldkennungsoll`, `importextrahabensoll`, `importfeldhaben`, `importfeldsoll`, `cronjobaktiv`, `cronjobverbuchen`) VALUES

BIN
doc/Install-10.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

BIN
doc/Install-20.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

BIN
doc/Install-30.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

BIN
doc/Install-40.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

BIN
doc/Install-50.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

BIN
doc/Install-60.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

BIN
doc/Install-70.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

BIN
doc/Install-done.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 KiB

1
doc/stub Normal file
View File

@ -0,0 +1 @@

View File

@ -765,6 +765,7 @@ $tooltip['firmendaten']['edit']['bezeichnungangebotersatz']="Im Angebot gibt es
$tooltip['firmendaten']['edit']['angebotersatz_standard']="Mit dieser Option setzen Sie die alternative Bezeichnung im Angebot (Option drüber) als Standard. Dadurch ist der Haken beim Erstellen eines neuen Angebots immer gesetzt.";
$tooltip['firmendaten']['edit']['bezeichnungauftragersatz']="Im Auftrag gibt es einen Haken um den Betreff des Augtrag-Belegs umzubenennen.<br>Mit der Option hier legen Sie den Namen des alternativen Betreffs fest.";
$tooltip['firmendaten']['edit']['bezeichnungrechnungersatz']="In der Rechnung gibt es einen Haken um den Betreff des Rechnung-Belegs umzubenennen.<br>Mit der Option hier legen Sie den Namen des alternativen Betreffs fest.";
$tooltip['firmendaten']['edit']['rechnungersatz_standard']="Mit dieser Option setzen Sie die alternative Bezeichnung in der Rechnung (Option drüber) als Standard. Dadurch ist der Haken beim Erstellen einer neuen Rechnung immer gesetzt.";
$tooltip['firmendaten']['edit']['bezeichnunglieferscheinersatz']="Im Lieferschein gibt es einen Haken um den Betreff des Lieferschein-Belegs umzubenennen.<br>Mit der Option hier legen Sie den Namen des alternativen Betreffs fest.";
$tooltip['firmendaten']['edit']['bezeichnungbestellungersatz']="In der Bestellung gibt es einen Haken um den Betreff des Bestell-Belegs umzubenennen.<br>Mit der Option hier legen Sie den Namen des alternativen Betreffs fest.";
$tooltip['firmendaten']['edit']['bezeichnungproformarechnungersatz']="In der Proformarechnung gibt es einen Haken um den Betreff der Proformarechnung-Belegs umzubenennen.<br>Mit der Option hier legen Sie den Namen des alternativen Betreffs fest.";
@ -1083,9 +1084,9 @@ $tooltip['produktionszentrum']['abschluss']['#auftragmengenanpassen']="Die Menge
$tooltip['produktion']['abschluss']['#mengeerfolgreich'] = 'Höhere Mengen als die geplante Menge können nur mit der deaktivierten (kein Haken setzen) Systemeinstellung "Produktionskorrektur nicht verwenden" verbucht werden. ';
$tooltip['produktion']['edit']['#mengeerfolgreich'] = $tooltip['produktion']['abschluss']['#mengeerfolgreich'];
$tooltip['produktion']['create']['#standardlager'] = "Lager, aus dem die Artikel für die Produktion ausgelagert werden sollen.Hier können alle Lager ausgewählt werden, in denen sich mindestens ein Lagerplatz befindet, aus dem Produktionen ausgelagert werden dürfen (Einstellung auf Regalebene unter Lager => Lagerverwaltung).";
$tooltip['produktion']['create']['#standardlager'] = "Lager, aus dem die Artikel für die Produktion ausgelagert werden sollen. Hier können alle Lager ausgewählt werden, in denen sich mindestens ein Lagerplatz befindet, aus dem Produktionen ausgelagert werden dürfen (Einstellung auf Regalebene unter Lager => Lagerverwaltung).";
$tooltip['produktion']['edit']['#standardlager'] = $tooltip['produktion']['create']['#standardlager'];
$tooltip['produktion']['edit']['#ziellager'] = "Wenn kein Ziellager angegenen ist, wird in das Standard-Lager des Artikels gebucht, wenn es das nicht gibt, in das Materiallager der Produktion.";
/* PROJEKT */
@ -1460,4 +1461,4 @@ $tooltip['coppersurcharge']['list']['surcharge-invoice'] = '(Pflichtfeld) Welche
$tooltip['coppersurcharge']['list']['surcharge-delivery-costs'] = '(Pflichtfeld) Bezugskosten sind eine Grundlage der Berechnungsformel (in %): Kupferzuschlag EUR/km = (Kupfergewicht (kg/km) * (DEL + Bezugskosten)) - Kupferbasis / 100. Der Standard sind derzeit 1%';
$tooltip['coppersurcharge']['list']['surcharge-copper-base-standard'] = '(Pflichtfeld) Die Kupferbasis ist eine Grundlage der Berechnungsformel: Kupferzuschlag EUR/km = (Kupfergewicht (kg/km) * (DEL + Bezugskosten)) - Kupferbasis / 100. Der Standard sind derzeit 150 EUR pro 100kg';
$tooltip['coppersurcharge']['list']['surcharge-copper-base'] = 'Falls ein Artikel eine abweichende Kupferbasis haben soll kann diese in einem Freifeld gepflegt werden. Dieses kann hier ausgewählt werden.';
$tooltip['coppersurcharge']['list']['surcharge-copper-number'] = '(Pflichtfeld) In diesem Freifeld kann die artikelspezifische Kupferzahl (km/kg) gepflegt werden. Sie ist Grundlage der Berechnung: Kupferzuschlag EUR/km = (Kupfergewicht (kg/km) * (DEL + Bezugskosten)) - Kupferbasis / 100.';
$tooltip['coppersurcharge']['list']['surcharge-copper-number'] = '(Pflichtfeld) In diesem Freifeld kann die artikelspezifische Kupferzahl (km/kg) gepflegt werden. Sie ist Grundlage der Berechnung: Kupferzuschlag EUR/km = (Kupfergewicht (kg/km) * (DEL + Bezugskosten)) - Kupferbasis / 100.';

Some files were not shown because too many files have changed in this diff Show More