Commit Graph

247 Commits

Author SHA1 Message Date
OpenXE
504f0beb54 Paketmarke added doctype to text 2023-10-26 20:46:07 +02:00
OpenXE
a5be2e984a versandpakete improvements, added lieferungen view 2023-10-25 13:26:52 +02:00
OpenXE
fb32cda643 versand bugfix no countries defined 2023-10-22 18:41:08 +02:00
OpenXE
a35ab21f7c versandpakete improvements 2023-10-20 15:47:37 +02:00
OpenXE
e899b1c389 versandpakete intermediate 2023-10-18 14:35:35 +02:00
OpenXE
b171dd7760 restored function VersandartMindestgewicht($id=0) in erpapi 2023-10-16 21:28:43 +02:00
OpenXE
4f7eb4049b versandpakete initial 2023-10-16 21:22:21 +02:00
OpenXE
b838b63258 removed deprecated paketmarke functions from erpapi 2023-10-10 18:17:42 +02:00
Andreas Palm
4dd8b01ea9 Shopware6: remove "v2" part from URL in Client-lib as well, set pseudolager default to 0 instead of empty string 2023-09-19 14:26:40 +02:00
OpenXE
91c2dc88ba document send preselect default mail address from firmendaten 2023-08-15 12:37:16 +02:00
Andreas Palm
7df897d9d7 Prestashop: import meta infos 2023-07-26 18:47:44 +02:00
Andreas Palm
cb2b75a3ca Prestashop: Improve article import 2023-07-25 00:05:17 +02:00
OpenXE
1c1c7034f1 mahnwesen added CRM for printed dokumente (email not yet implemented) 2023-06-15 17:03:42 +02:00
OpenXE
2c7f113d6b mahnwesen initial 2023-06-13 18:35:59 +02:00
OpenXE
1f6caa8632 mahnwesen initial 2023-06-08 15:35:46 +02:00
OpenXE
73725a31bb rechnung calculate payment status with skonto 2023-06-07 15:40:36 +02:00
OpenXE
75bd00770c ticket system show user's tickets and all tickets separately in sidebar 2023-05-22 18:42:20 +02:00
OpenXE
674c7b9958 bugfix send document with ',' in name 2023-05-22 14:01:34 +02:00
OpenXE
4ffeafa5ac bugfix gruppensumme PDF Briefpapier::Cell_typed(): Argument #3 ($txt) must be of type string, null given 2023-05-05 09:58:15 +02:00
OpenXE
b497d65d81 cronjob lagerzahlen set cache_lagerplatzinhaltmenge only on success 2023-04-27 18:07:08 +02:00
OpenXE
87a884bd8a Bugfix auftrag vorkasse_ok 2023-04-26 11:10:07 +02:00
OpenXE
7de88ca3b5 gutschrift freigabe with our without offsettung against rechnung, with offsetting creates fibu_buchung 2023-04-21 14:59:02 +02:00
OpenXE
17bdb1c5e1 auftrag set vorkasse_ok according to fibu_buchungen 2023-04-13 21:58:11 +02:00
OpenXE
ea6a6a5dda rechnung removed all updates of ist, except from fibu_buchungen 2023-04-11 15:40:23 +02:00
OpenXE
69172672b2 fibu_buchhaltung belege zuordnen multi option 2023-04-11 15:20:40 +02:00
OpenXE
44af8f3b3d Bugfix erpapi lagernummern typo 2023-04-07 18:17:57 +02:00
OpenXE
82fc367405 fibu_buchungen einzelzuordnung 2023-04-06 15:33:53 +02:00
OpenXE
b701a880a4 Merge remote-tracking branch 'github/master' into develop.1.8.1 2023-04-01 22:39:15 +02:00
Andreas Palm
e79e2e24d2 Sendcloud: Fix for domestic parcels - use IsEU instead of IstEU :-/ 2023-03-31 22:30:35 +02:00
Andreas Palm
03f51a548a Sendcloud: handle field requirement/null for parcels without customs declaration 2023-03-31 10:21:25 +02:00
Andreas Palm
b6c23399c6 Versanddienstleister: display customs form only for non-EU countries, improve product/method selection 2023-03-30 22:24:40 +02:00
OpenXE
689fdb0490 Kontoauszuege konto overview and saldo 2023-03-30 19:29:46 +02:00
OpenXE
b7153c423c fibu_buchungen added, rework of zahlungen auftrag, rechnung, gutschrift 2023-03-28 12:30:57 +02:00
Andreas Palm
aa93070185 Merge remote-tracking branch 'upstream/master' into sendcloud
# Conflicts:
#	www/pages/versandarten.php
2023-03-27 15:27:10 +02:00
OpenXE
7a83c9fd29 Bugfix briefpapier freitexte width 2023-03-26 13:28:20 +02:00
OpenXE
09039f9d2a Bugfix user avatar 2023-03-26 13:27:49 +02:00
OpenXE
49dfd255e4 Bugfix briefpapier freitexte width 2023-03-26 13:26:49 +02:00
OpenXE
791a12b731 Bugfix user avatar 2023-03-26 13:23:15 +02:00
OpenXE
c220639e82 Zahlungsstatus Rechnung Gutschrift reworked with fibu_buchungen 2023-03-25 17:50:04 +01:00
Andreas Palm
98bbdec8d3 fix link in menu 2023-03-24 00:28:39 +01:00
Andreas Palm
51552e7530 cleanup old versandarten 2023-03-23 23:23:03 +01:00
Andreas Palm
696e9efc76 improve stability of versandarten 2023-03-23 23:22:45 +01:00
OpenXE
e356051f5a Zahlungen improvements 2023-03-22 14:33:34 +01:00
OpenXE
ab91715c20 Zahlungen minidetail and collation of relevant documents as tree 2023-03-16 11:49:45 +01:00
OpenXE-ERP
f5b326682c
Merge pull request #57 from exciler/prestashop
Prestashop
2023-03-13 13:00:06 +01:00
OpenXE-ERP
7623f2fb6a
Merge pull request #26 from exciler/sendcloud
Basic Sendcloud integration with Shipment rework
2023-03-13 12:59:27 +01:00
OpenXE
44781b52bb Export Buchhaltung first version 2023-03-09 16:40:25 +01:00
Andreas Palm
cd73a58ece add copyright/license 2023-02-28 13:40:31 +01:00
Andreas Palm
f37ef6e591 add copyright/license 2023-02-28 13:36:25 +01:00
OpenXE
05714cfd21 Bugfix Shop LagerSync 2023-02-16 10:56:00 +01:00
OpenXE
ad3207d67c erpapi FormatMenge default 0 decimal places 2023-02-10 11:08:03 +01:00
Andreas Palm
ef8b79ff19 Versandarten: Bugfix prefill Zolltarifnummer,Herkunftsland 2023-02-05 22:15:54 +01:00
OpenXE
aff5eef945 Waehrumgumrechnung module restored 2023-02-05 13:23:03 +01:00
Andreas Palm
d84b20fafe Versandarten: Bugfix shipment_type not transmitted 2023-02-01 15:42:03 +01:00
Andreas Palm
aafcb4130f Versanddienstleister: prefill order number, zolleinzelwert should default to 0 instead of null 2023-01-31 12:12:01 +01:00
Andreas Palm
88eb1757b2 Fix usage of Versandarten by cronjobs 2023-01-29 23:38:34 +01:00
Andreas Palm
b14265b49d Sendcloud fix error if no export documents are present 2023-01-29 23:38:30 +01:00
Andreas Palm
575ab86157 Sendcloud error handling 2023-01-29 23:38:27 +01:00
Andreas Palm
3fe2c7a5d9 Merge remote-tracking branch 'upstream/master' into sendcloud 2023-01-29 23:37:48 +01:00
Andreas Palm
4eac5fbbdc Bugfixes presta, support for project specific number ranges 2023-01-29 15:38:30 +01:00
Andreas Palm
bcf2544735 Bugfixes presta, support for project specific number ranges 2023-01-29 14:50:15 +01:00
Andreas Palm
100024391d Bugfixes presta, support for project specific number ranges 2023-01-29 14:34:47 +01:00
Andreas Palm
0e3afa437b Bugfix shopimport, bugfixes presta, support for project specific number ranges 2023-01-29 12:06:32 +01:00
Andreas Palm
5539c9849c Presta shopimporter 2023-01-28 13:04:28 +01:00
OpenXE
9a721758a9 Improvements Ticket system, date format, mail address search 2023-01-16 18:10:01 +01:00
OpenXE
cad0103b7f Translations for documents -> fill out table uebersetzungen 2023-01-10 14:13:19 +01:00
OpenXE
c006c1c474 bugfix erpapi ANABREGSNeuberechnen 2023-01-04 13:20:23 +01:00
OpenXE
67d7a63898 bestellvorschlag new module WIP 2022-12-29 16:28:37 +01:00
OpenXE
2acc8aceb9 Bugfix count(0) dokumente 2022-12-28 17:08:19 +01:00
OpenXE
0648e57b63 Bugfix for use of BCC for all mails 2022-12-21 15:05:05 +00:00
OpenXE
0afc12e718 bugfix dokumente zahlungsziel not defined ('' vs. 0) 2022-12-17 13:03:53 +00:00
OpenXE
e4773da6f0 Upgrade from frontend 2022-12-05 22:29:48 +00:00
OpenXE
b70676f4a0 Merge branch 'master' into develop 2022-12-02 13:25:22 +00:00
OpenXE
6df7be74b7 Bugfixes for project specific PDF background -> UPGRADE DB with database_compare 2022-12-02 13:21:43 +00:00
OpenXE
9b62b7c247 Merge branch 'master' into develop 2022-12-02 12:15:36 +00:00
OpenXE
d41745ceda Bugfix of bugfix ClearSqlCache TIMESTAMPDIFF 2022-12-02 12:13:49 +00:00
OpenXE
8c1eb6c3cc Bugfixes www/lib/dokumente/class.briefpapier.php 2022-12-02 12:04:23 +00:00
OpenXE
d6dcc9f4c6 bugfix ClearSqlCache TIMESTAMPDIFF 2022-12-02 11:31:15 +00:00
OpenXE
ae261d7a47 Removed xentral update functions 2022-12-02 11:20:02 +00:00
Andreas Palm
c37f0d3847 DHL: First test candidate ;-) 2022-11-22 00:21:57 +01:00
Andreas Palm
8ad45ed723 Basic DHL implementation, Refactor redundant code 2022-11-14 22:29:42 +01:00
Andreas Palm
d676a1b09a Improve Sendcloud error handling 2022-11-02 22:37:04 +01: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
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
root
445ba3529c Bugfix in fpdi (external lib) rewrite of function each() 2022-09-13 06:58:13 +00: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
dfdad1b8c4 Ticket system implemented ticketregeln (ticket rules) 2022-08-07 11:50:13 +02:00
Xenomporio
4af7eacfd8 Ticket system / sendmail, changes to response citation and html chars handling 2022-08-06 10:40:58 +02:00
Xenomporio
eed70bf673 Bugfix for email address handling in ticket system 2022-08-04 16:50:22 +02:00
Xenomporio
244d30faa9 Bugfix display of open tickets in sidebar 2022-08-01 22:56:28 +02:00
Xenomporio
7bbcdf206b Ticket system now with drafts and attachement of sent mails 2022-07-30 10:49:47 +02:00
Xenomporio
7efbe5bd0b Changes regarding ticket incoming file attachments 2022-07-27 18:05:24 +02:00
Xenomporio
eed061776a Some improvements erpapi mail 2022-07-26 17:35:16 +02:00
Xenomporio
9b9e6d13c5 Storing sent mails to IMAP folder now works 2022-07-23 21:11:01 +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
910a8544a4 Some frontend adaption for the ticket system 2022-07-22 11:15:15 +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
ba1157dbfc Removed select from steuerregelngruppe, table does not exist 2022-07-20 12:29:51 +02:00
Xenomporio
99bbbdca42 Bugfix in IMAP put mail into sentfolder 2022-07-17 23:25:34 +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
3cdbc88e56 Bugfix no email account 2022-07-06 15:31:09 +02:00
Xenomporio
48d4540d04 Merge branch 'branding' into develop 2022-07-03 21:44:23 +02:00
Xenomporio
40280fedda Bugfix rechnung 2022-07-03 21:21:09 +02:00
Xenomporio
3e288339a7 administration -> System settings -> addes logfile 2022-07-03 16:18:03 +02:00
Xenomporio
c5ec35bfe0 sendmail function can now send to multiple recipients 2022-06-30 12:31:39 +02:00
Xenomporio
dd2fa38268 Bugfixes for kalendermail & xenomporio version V1.0.RC1 2022-06-29 21:43:37 +02:00
Xenomporio
502d9c45e5 Merge branch 'branding' into develop 2022-06-29 16:30:57 +02:00
Xenomporio
736e1bd506 Debranded test email 2022-06-29 16:30:11 +02:00
Xenomporio
d59b7da9a2 Linked emailbackup email accounts to company wide settings in firmendaten
-> To do: clean up emailbackup accounts with smtp / imap settings
2022-06-26 18:15:30 +02:00
Xenomporio
e8dea5a81b Bugfix sendmail cc & bcc empty 2022-06-26 15:34:06 +02:00
Xenomporio
2a56b14fa8 Removed old phpmailer 2.1 and migrated sending process to SystemMailer 2022-06-25 16:49:03 +02:00
Xenomporio
14aa8b6ffd Merge branch 'branding' into develop 2022-06-22 10:36:53 +02:00
Xenomporio
d657f52491 Bugfix double entry of module_action upon initialisation -> Insert / Update 2022-06-22 10:27:28 +02:00
Xenomporio
d8a9da0546 Bugfix partlist order price is_numeric 2022-06-14 14:49:28 +02:00
Xenomporio
eff8fce974 Bugfixes process offer to invoice 2022-06-13 19:50:44 +02:00
Xenomporio
3d2383690b Initial branding 2022-06-12 15:59:32 +02:00
Xenomporio
47415a6942 Bugfix send order 2022-06-10 17:53:47 +02:00
Xenomporio
b974f1c38e Bugfix count(null) www/lib 2022-06-10 17:39:14 +02:00
Xenomporio
526506575a Bugfixes CRM 2022-05-30 21:39:00 +02:00
Xenomporio
70594fbd00 Bugfixes gutschrift 2022-05-30 21:04:38 +02:00
Xenomporio
3dc55afd69 Bugfix zeiterfassung 2022-05-30 16:02:15 +02:00
Xenomporio
61c0675e58 Bugfix benutzer 2022-05-30 14:48:41 +02:00
Xenomporio
747e7b0b83 Bugfix shopexport -> removed dropping of field gesamtbetragfestsetzendifferenz 2022-05-27 12:26:13 +02:00
Xenomporio
cd647bd6ba Bugfixes artikel 2022-05-26 21:51:59 +02:00
Xenomporio
c1a56db38d Bugfixes lieferschein 2022-05-24 21:50:35 +02:00
Xenomporio
0b0224f6ba Bugfixes angebot, ajax to repair 2022-05-24 14:49:51 +02:00
Xenomporio
8fe43e827a Bugfixes supportapp 2022-05-23 22:25:53 +02:00
Xenomporio
419537d1fd Bugfixes rechnung 2022-05-23 21:03:20 +02:00
Xenomporio
bc3cbb173e Bugfixes adresse 2022-05-23 18:04:57 +02:00
Xenomporio
e8c563d152 Rewrite of deprecated PHP each() function 2022-05-18 18:09:10 +02:00
Xenomporio
3a48633203 Bugfix escaped string list of countries 2022-05-18 14:58:21 +02:00
Xenomporio
b117cd0576 Some fixes in databaseupgrade 2022-05-18 14:49:39 +02:00
Xenomporio
b3d89e7fc2 Fixed typo 2022-05-18 14:39:06 +02:00
Xenomporio
7fcbc97aac Removed deprecated column alteration Firmendaten footer 2022-05-18 14:37:23 +02:00
Xenomporio
e0b4a1cd2e Changed all timestamps to NOT NULL DEFAULT CURRENT_TIMESTAMP for DatabaseUpgrade() 2022-05-18 09:39:13 +02:00
Xenomporio
9ce1baa5ff Removed unnecessary table fix drucker 2022-05-17 23:18:17 +02:00
Xenomporio
26f60b2390 Removed unnecessary table fix article_property_translation id 2022-05-17 23:16:35 +02:00
Xenomporio
f4098c71b5 Removed unnecessary typo fix liabilitiy_id 2022-05-17 23:13:54 +02:00
Xenomporio
7e96a351d4 Bugfix add primary key firmendaten_werte only if not already present 2022-05-17 20:28:46 +02:00
Xenomporio
2107e986f6 Removed comment lines starting with # 2022-05-16 14:14:29 +02:00
Alex
34e5ac43d9 Initial xentral_oss_20.3.c9ffacf 2021-05-21 08:49:41 +02:00