s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-15 04:27:14 +01:00
Code Issues Projects Releases Wiki Activity
681 Commits 5 Branches 13 Tags 543 MiB
fa4125d63b
Commit Graph

357 Commits

Author SHA1 Message Date
OpenXE
f535679263 Auftrag offene positionen 2023-01-12 16:20:31 +01:00
OpenXE
613d45b1cc Ticket system improvements for import encoding, ticket system limited display of html elements (strip_tags) 2023-01-12 00:01:20 +01:00
OpenXE
1fdd6dbf95 Bugfix produktion non-stock artikel 2023-01-11 12:08:23 +01:00
OpenXE
cad0103b7f Translations for documents -> fill out table uebersetzungen 2023-01-10 14:13:19 +01:00
OpenXE
57d0592a9a Bugfix ticket mail citation 2023-01-09 11:16:39 +01:00
OpenXE
f76400e248 Bestellvorschlag now working 2023-01-08 18:51:29 +01:00
OpenXE
3c7e189acb Bugfix importvorlage verkaufspreise 2023-01-05 12:53:05 +01:00
OpenXE
78e56ab160 Bugfix ticket system new mail signature 2023-01-03 12:44:51 +01:00
OpenXE
ab65feb455 Bestellvorschlag with parameter absatz and voraus 2023-01-02 11:29:53 +01:00
OpenXE
5b74049f5c Bestellvorschlag table for saved values and auftrag WIP 2023-01-01 17:52:45 +01:00
root
aa3dea0277 bestellvorschlag with subselect only > 0 WIP 2022-12-29 17:43:24 +01:00
OpenXE
67d7a63898 bestellvorschlag new module WIP 2022-12-29 16:28:37 +01:00
Andreas Palm
781fbc2600 Merge remote-tracking branch 'upstream/master' into subscriptioncycle 2022-12-27 21:29:43 +01:00
OpenXE
d94c05383a ticket system design improvements, subject in info box, optimized space usage, bugfix warteschlange autocomplete 2022-12-23 19:55:48 +01:00
OpenXE
135017158c Log with milliseconds 2022-12-23 19:12:52 +01:00
Andreas Palm
474970e358 Fix PHP 7 compat 2022-12-22 22:27:27 +01:00
Andreas Palm
6e8f715f66 Create module rechnungslauf, basic version 2022-12-22 00:16:33 +01:00
OpenXE
0648e57b63 Bugfix for use of BCC for all mails 2022-12-21 15:05:05 +00:00
OpenXE
143e4e96bd ticket system minor design improvement 2022-12-21 09:34:33 +00:00
OpenXE
2cfe710c9a bugfixe auftrag minidetail versandzentrum 2022-12-19 12:49:16 +00:00
OpenXE
35f6532520 Teilauftrag WIP 2022-12-16 17:33:15 +00:00
OpenXE
0848148b9e shopimporter_shopware6 removed v2 from URL to allow shopware 6.4 api 2022-12-15 10:40:10 +00:00
OpenXE
ca9b48cb58 upgrade some usability improvements, upgrade.sh script 2022-12-14 17:12:12 +00:00
OpenXE
817dd802aa upgrade added info and -o option 2022-12-14 15:25:48 +00:00
OpenXE
724c57d309 upgrade improved folder handling, git init 2022-12-13 18:40:13 +00:00
OpenXE
3ea5c0e478 upgrade added external connection option, optimized db_schema.json (views now with brackets around expressions) 2022-12-09 07:13:12 +00:00
OpenXE
08262cce5c upgrade from frontend improvements 2022-12-06 20:05:41 +00:00
OpenXE
ce268dca0e upgrade and database_compare combined, database_compare removed. View "belegeregs" removed. 2022-12-06 17:02:00 +00:00
OpenXE
e4773da6f0 Upgrade from frontend 2022-12-05 22:29:48 +00:00
OpenXE
a041c6a82c Merge branch 'master' into develop 2022-12-03 11:43:11 +00:00
OpenXE
1a343b4b55 Bugfix www/pages/shopimporter_shopware6.php typo 2022-12-03 10:03:28 +00:00
OpenXE
b70676f4a0 Merge branch 'master' into develop 2022-12-02 13:25:22 +00:00
OpenXE
6df7be74b7 Bugfixes for project specific PDF background -> UPGRADE DB with database_compare 2022-12-02 13:21:43 +00:00
OpenXE
b5926ee039 Bugfix www/pages/shopimporter_shopware6.php 2022-12-02 12:19:42 +00:00
OpenXE
ae261d7a47 Removed xentral update functions 2022-12-02 11:20:02 +00:00
OpenXE
76603076cd Produktion typo bugfix 2022-11-21 11:48:51 +00:00
OpenXE
17fa438529 Produktion show no available material when no lager selected, Lager renamed Materiallager 2022-11-18 16:58:16 +01:00
OpenXE
14e64b8f4b Produktion Lager verfuegbar alle 2022-11-18 16:22:34 +01:00
OpenXE
df028888e9 Produktion remove old msg on submit 2022-11-18 16:14:02 +01:00
OpenXE
625b9627e8 Produktion minor bugfixes 2022-11-17 17:56:58 +01:00
OpenXE
3ee518af03 Produktion ziellagerplatz, use lagerplatz of artikel or produktion 2022-11-16 12:17:16 +00:00
OpenXE
8518e327aa Produktion cosmetic 2022-11-15 16:40:37 +00:00
OpenXE
84cdd8754a Produktion Protokoll 2022-11-15 16:24:21 +00:00
OpenXE
7c468dbced Produktion minidetail 2022-11-15 14:50:59 +00:00
OpenXE
ba31fc62cf Produktion copy 2022-11-15 11:30:25 +00:00
OpenXE
f6a1315192 Produktion go to edit after new item 2022-11-15 09:16:58 +00:00
OpenXE
c219c32212 Bugfix Produktion new item 2022-11-11 17:07:42 +00:00
OpenXE
e1b8b7864f Produktion filter list 2022-11-11 15:14:59 +00:00
OpenXE
822960b9f0 Bugfix Produktion refresh all icons on list action 2022-11-11 15:22:04 +01:00
OpenXE
0fef7146c6 Produktion refresh all icons on list action 2022-11-11 14:16:46 +00:00
OpenXE
27d48a55bb Produktion adjust reservation if there is scrap, fixed icons TBD: cronjob for icon update 2022-11-10 21:42:53 +00:00
OpenXE
06dbb9b8b8 Produktion improvement using functions, production progress with reserved quantity 2022-11-10 19:48:34 +00:00
OpenXE
99d5804ffa Added user edit check DisableModuls 2022-11-10 16:00:25 +00:00
OpenXE
3d37049ea1 Produktion menge anpassen 2022-11-10 12:08:30 +01:00
OpenXE
1bf8f567b4 Bugfix Produktion reservieren 2022-11-10 10:32:03 +01:00
OpenXE
39e741a595 Bugfix Produktion teilproduktion preserve old values, bugfix list view artikel name 2022-11-10 10:10:04 +01:00
OpenXE
e2120d1862 Bugfix Produktion auslagern 2022-11-09 17:19:20 +01:00
OpenXE
8c67d97728 Produktion teilen, leeren 2022-11-09 14:48:09 +00:00
OpenXE
3b804ef745 Produktion Teilproduktion WIP 2022-11-08 22:22:27 +00:00
OpenXE
aea469320f Bugfix Produktion material per artikel 2022-11-08 15:52:33 +01:00
OpenXE
a9cab336d0 Lager reservierungen added column Artikelnummer 2022-11-07 18:15:10 +00:00
OpenXE
4b27887dd2 Bugfix Produktuion display of stock numbers 2022-11-07 17:09:19 +00:00
OpenXE
8c559bf5cf Produktion column alignment of numbers 2022-11-07 15:52:16 +00:00
OpenXE
ef8b6f7a1f Bugfix produktion list 2022-11-07 16:23:16 +01:00
OpenXE
348d946637 Bugfix intial produktion status 2022-11-07 16:08:25 +01:00
OpenXE
cadbf08376 Produktion show open quantities 2022-11-07 16:05:56 +01:00
OpenXE
68723b7c4b Bugfix Produktion number format 2022-11-07 14:00:51 +00:00
OpenXE
e6188d9153 Bugfix Produktion list artikel 2022-11-07 13:28:35 +00:00
OpenXE
ea5ac90b13 Bugfix Produktion empty status 2022-11-07 11:29:43 +00:00
OpenXE
8032bf779a Merge branch 'master' into develop 2022-11-06 20:17:17 +00:00
OpenXE
ed5d1690ef Bugfix Produktion icons 2022-11-06 18:46:57 +00:00
OpenXE
c0380142ba WIP Produktion edit postions 2022-11-06 18:42:42 +00:00
OpenXE
cfbc602443 WIP Produktion material needed per item 2022-11-06 15:18:54 +00:00
OpenXE
e249d5a715 WIP Produktion formatting 2022-11-06 15:06:13 +00:00
OpenXE
411ab85359 WIP Produktion process with stock removal, reservation and stock adding 2022-11-04 15:39:12 +00:00
OpenXE
9f616fc0e5 Produktion WIP list view improvements 2022-11-03 21:48:12 +00:00
OpenXE
2e6d57e93a Produktion WIP reservieren bugfix 2022-11-03 21:30:14 +00:00
OpenXE
dc6827fc1e Produktion WIP aggregated view on material items 2022-11-03 14:49:42 +00:00
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
6a2a16c0a6 Sendcloud bugfixes and improvements 2022-10-29 21:38:28 +02: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
d5f60e73c1 Produktion edit view with positions 2022-10-26 13:52:50 +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
Xenomporio
1ce413a763 OpenXE rebranding 2022-10-14 14:22:08 +02:00
Xenomporio
bd10919ea1 Removed www/pages/content/rahmen70red_ohne_form.tpl:w 2022-10-11 10:32:55 +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
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
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
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
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
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
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
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
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
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
e3e9e52ff5 Many modifications to wareneingang and paketdistribution 2022-07-20 12:27:12 +02:00
Xenomporio
b27b5d155e Small changes versandzentrum 2022-07-19 17:15:51 +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
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
eff711a539 Minidetail versandzentrum added 2022-07-12 17:23:02 +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
ba81d2daaa Remove invite team members popup at first login 2022-07-04 21:36:11 +02:00
Xenomporio
48d4540d04 Merge branch 'branding' into develop 2022-07-03 21:44:23 +02:00
Xenomporio
dfb78a577e Bugfix zeiterfassung table serviceauftrag does not exist 2022-07-03 21:21:09 +02:00
Xenomporio
51f1d726ee Bugfix for lager bestand and bewegung show only those regale of the actual lager 2022-07-03 21:21:04 +02:00
Xenomporio
3e288339a7 administration -> System settings -> addes logfile 2022-07-03 16:18:03 +02:00
Xenomporio
897c9663a4 Bugfix for lager bestand and bewegung show only those regale of the actual lager 2022-07-01 15:21:25 +02:00
Xenomporio
0ee71cffc4 Fixed ics invitations sending with correct participants calendar 2022-07-01 12:20:17 +02:00
Xenomporio
3c8ddedd3e Heavy rework of the calendar component and user selection -> Sending of invitations TBD 
Split function to allow compatibility to old API but use newer function with all mail addresses as parameter (not from event)
 2022-06-30 21:51:05 +02:00
Xenomporio
d5b66aae82 bugfix ajax filter for ansprechpartneradresse filters now with adress 0 = none 2022-06-30 14:33:48 +02:00
Xenomporio
77fde43724 Merge branch 'branding' into develop 2022-06-29 15:58:02 +02:00
Xenomporio
bce656f4ad Unified some texts regarding license and copyright 2022-06-29 15:56:12 +02:00
Xenomporio
33b73f56aa Improvement of emailbackup page including button for SMTP test 2022-06-28 17:01:23 +02:00
Xenomporio
d175dbc85e Primitive emailbackup module for editing email accounts 2022-06-26 18:26:37 +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
448e1e569c Minimal module implementation emailbackup -> to be replaced by auto-generated module 2022-06-23 14:24:32 +02:00
Xenomporio
5fcf353050 Bugfix firmendaten non-existing columns -> THIS HAS TO BE MIGRATED TO firmendaten_werte 2022-06-22 13:58:43 +02:00
Xenomporio
14aa8b6ffd Merge branch 'branding' into develop 2022-06-22 10:36:53 +02:00
Xenomporio
06143f98b1 Implemented: user rights cannot be removed as soon as user template grants this right. 2022-06-20 16:27:51 +02:00
Xenomporio
af3efdc0c4 Reimplemented missing modul "Uservorlage" 2022-06-20 15:34:21 +02:00
Xenomporio
cbdbb586a9 Bugfix kursusd and kurschf = NULL 2022-06-14 15:22:02 +02:00
Xenomporio
ab4d7c2ac8 Bugfix removed arbeitsnachweis, preferred language firmendaten.php 2022-06-13 17:54:40 +02:00
Xenomporio
3d2383690b Initial branding 2022-06-12 15:59:32 +02:00
Xenomporio
eaa3b1da75 Bugfix count(null) www/pages 2022-06-10 11:28:28 +02:00
Xenomporio
7e9503e1b6 Bugfixes importvorlage 2022-06-01 17:15:59 +02:00
Xenomporio
526506575a Bugfixes CRM 2022-05-30 21:39:00 +02:00
Xenomporio
72b76be062 Bugfix artikel ajax 2022-05-30 21:13:58 +02:00
Xenomporio
e201f50b00 Bugfixes projekt preview and files list 2022-05-30 16:21:01 +02:00
Xenomporio
3dc55afd69 Bugfix zeiterfassung 2022-05-30 16:02:15 +02:00
Xenomporio
d2862cb130 Bugfix bestellung 2022-05-30 15:40:17 +02:00
Xenomporio
0862515799 Bugfix berichte 2022-05-30 15:01:35 +02:00
Xenomporio
61c0675e58 Bugfix benutzer 2022-05-30 14:48:41 +02:00
Xenomporio
731da54b2b Bugfix managementboard 2022-05-27 12:09:02 +02:00
Xenomporio
784f9104d2 Bugfix aufgaben 2022-05-27 12:06:12 +02:00
Xenomporio
cd647bd6ba Bugfixes artikel 2022-05-26 21:51:59 +02:00
Xenomporio
071601fa35 Bugfix verkaufszahlen 2022-05-25 09:24:23 +02:00
Xenomporio
c1a56db38d Bugfixes lieferschein 2022-05-24 21:50:35 +02:00
Xenomporio
ebc8f31781 Bugfix dsgvo 2022-05-24 16:53:33 +02:00
Xenomporio
15a4784662 Bugfix adresse preview 2022-05-24 16:24:44 +02:00
Xenomporio
b7f553664b Bugfixes angebot ajax positionen 2022-05-24 16:09:30 +02:00
Xenomporio
0b0224f6ba Bugfixes angebot, ajax to repair 2022-05-24 14:49:51 +02:00
Xenomporio
ef13e61896 Bugfix dateien 2022-05-24 08:50:43 +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