Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a78571aa45 | ||
|
|
f64f6f64cb | ||
|
|
af4c64359b | ||
|
|
383524f348 | ||
|
|
2bb3130b00 |
@@ -13,6 +13,16 @@ Xenomporio ist eine umfassende webbasierte Anwendung zur Abwicklung aller kaufm
|
|||||||
* Aufgaben- und Terminverwaltung
|
* Aufgaben- und Terminverwaltung
|
||||||
* Zeitabrechnung
|
* Zeitabrechnung
|
||||||
|
|
||||||
|
# Letzte Änderungen: Ticket System
|
||||||
|
|
||||||
|
Neu in [V.1.3](https://github.com/xenomporio-org/Xenomporio/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 Server Installation](SERVER_INSTALL.md)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
f64f6f64cbe6499f4060a487603626a6d712a484
|
||||||
+1206
-1198
File diff suppressed because it is too large
Load Diff
@@ -12174,7 +12174,6 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* NOT USED
|
|
||||||
function AutoCompleteAuftrag($fieldname, $filter, $onlyfirst = 0, $extendurl = "") {
|
function AutoCompleteAuftrag($fieldname, $filter, $onlyfirst = 0, $extendurl = "") {
|
||||||
|
|
||||||
$module = $this->app->Secure->GetGET("module");
|
$module = $this->app->Secure->GetGET("module");
|
||||||
@@ -12246,7 +12245,7 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
|
|||||||
}
|
}
|
||||||
return str_replace($replace, $new, $sql);
|
return str_replace($replace, $new, $sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
function AutoCompleteBestellung($fieldname, $filter, $onlyfirst = 0, $extendurl = "") {
|
function AutoCompleteBestellung($fieldname, $filter, $onlyfirst = 0, $extendurl = "") {
|
||||||
|
|
||||||
$module = $this->app->Secure->GetGET("module");
|
$module = $this->app->Secure->GetGET("module");
|
||||||
@@ -12276,7 +12275,7 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . '"
|
|||||||
$this->app->Tpl->Set(strtoupper($fieldname) . 'START', '<div style="font-size: 8pt;"><div class="ui-widget" style="font-size: 8pt;">');
|
$this->app->Tpl->Set(strtoupper($fieldname) . 'START', '<div style="font-size: 8pt;"><div class="ui-widget" style="font-size: 8pt;">');
|
||||||
$this->app->Tpl->Set(strtoupper($fieldname) . 'ENDE', '</div></div>');
|
$this->app->Tpl->Set(strtoupper($fieldname) . 'ENDE', '</div></div>');
|
||||||
}
|
}
|
||||||
|
|
||||||
function AutoCompleteAddCut($fieldname, $filter, $onlyfirst = 0, $extendurl = "") {
|
function AutoCompleteAddCut($fieldname, $filter, $onlyfirst = 0, $extendurl = "") {
|
||||||
|
|
||||||
|
|
||||||
@@ -12330,7 +12329,6 @@ return false;
|
|||||||
$this->app->Tpl->Set(strtoupper($fieldname) . 'ENDE', '</div></div>');
|
$this->app->Tpl->Set(strtoupper($fieldname) . 'ENDE', '</div></div>');
|
||||||
}
|
}
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
function AutoCompleteAdd($fieldname, $filter, $onlyfirst = 0, $extendurl = "") {
|
function AutoCompleteAdd($fieldname, $filter, $onlyfirst = 0, $extendurl = "") {
|
||||||
|
|
||||||
@@ -12387,8 +12385,6 @@ return false;
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* NOT USED
|
|
||||||
|
|
||||||
function AutoCompleteAddEvent($fieldname, $filter, $onlyfirst = 0, $extendurl = "") {
|
function AutoCompleteAddEvent($fieldname, $filter, $onlyfirst = 0, $extendurl = "") {
|
||||||
if ($onlyfirst) {
|
if ($onlyfirst) {
|
||||||
$tpl = '
|
$tpl = '
|
||||||
@@ -12479,7 +12475,6 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
function AutoComplete($fieldname, $filter, $onlyfirst = 0, $extendurl = "", $extendedelement = "", $extendurl2 ="", $extendedelement2 = "", $appendto = "", $return = false) {
|
function AutoComplete($fieldname, $filter, $onlyfirst = 0, $extendurl = "", $extendedelement = "", $extendurl2 ="", $extendedelement2 = "", $appendto = "", $return = false) {
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
$version="OSS";
|
$version="OSS";
|
||||||
$version_revision="1.0";
|
$version_revision="1.3.1";
|
||||||
$githash = file_get_contents("../githash.txt");
|
$githash = file_get_contents("../githash.txt");
|
||||||
if (!empty($githash)) {
|
if (!empty($githash)) {
|
||||||
$version_revision .= " (".substr($githash,0,8).")";
|
$version_revision .= " (".substr($githash,0,8).")";
|
||||||
|
|||||||
@@ -163,8 +163,10 @@ class Wareneingang
|
|||||||
//&NBSP;<a href=\"#\" onclick=\"if(!confirm('Auftrag wirklich aus dem Versand nehmen?')) return false; else window.location.href='index.php?module=versanderzeugen&action=delete&id=%value%';\"><img src=\"./themes/[THEME]/images/delete.svg\" border=\"0\"></a></td></tr></table>";
|
//&NBSP;<a href=\"#\" onclick=\"if(!confirm('Auftrag wirklich aus dem Versand nehmen?')) return false; else window.location.href='index.php?module=versanderzeugen&action=delete&id=%value%';\"><img src=\"./themes/[THEME]/images/delete.svg\" border=\"0\"></a></td></tr></table>";
|
||||||
$menucol = 4;
|
$menucol = 4;
|
||||||
|
|
||||||
if($this->app->erp->Firmendaten("wareneingang_lagerartikel")) $lagerartikel = "AND art.lagerartikel = 1";
|
// if($this->app->erp->Firmendaten("wareneingang_lagerartikel")) $lagerartikel = "AND art.lagerartikel = 1";
|
||||||
else $lagerartikel = "";
|
// else
|
||||||
|
|
||||||
|
$lagerartikel = "";
|
||||||
$receiptDocument = $this->app->erp->ModulVorhanden('receiptdocument');
|
$receiptDocument = $this->app->erp->ModulVorhanden('receiptdocument');
|
||||||
if($receiptDocument) {
|
if($receiptDocument) {
|
||||||
$this->app->DB->Select('SELECT id FROM receiptdocument LIMIT 1');
|
$this->app->DB->Select('SELECT id FROM receiptdocument LIMIT 1');
|
||||||
|
|||||||
+10
-5
@@ -890,18 +890,23 @@ $this->app->Tpl->Add('TODOFORUSER',"<tr><td width=\"90%\">".$tmp[$i]['aufgabe'].
|
|||||||
|
|
||||||
$this->app->erp->RunHook('welcome_start', 1 , $this);
|
$this->app->erp->RunHook('welcome_start', 1 , $this);
|
||||||
|
|
||||||
if(empty($this->app->User->GetField('role')) || $this->app->acl->IsAdminadmin()) {
|
// Xentral 20 database compatibility
|
||||||
$this->app->ModuleScriptCache->IncludeWidgetNew('ClickByClickAssistant');
|
if ($this->app->DB->Select("SHOW COLUMNS FROM `user` LIKE 'role'")) {
|
||||||
$this->app->ModuleScriptCache->IncludeJavascriptFiles(
|
|
||||||
|
if(empty($this->app->User->GetField('role')) || $this->app->acl->IsAdminadmin()) {
|
||||||
|
$this->app->ModuleScriptCache->IncludeWidgetNew('ClickByClickAssistant');
|
||||||
|
$this->app->ModuleScriptCache->IncludeJavascriptFiles(
|
||||||
'welcome',
|
'welcome',
|
||||||
[
|
[
|
||||||
'body' => [
|
'body' => [
|
||||||
'./classes/Modules/Welcome/www/js/welcome_firststart.js',
|
'./classes/Modules/Welcome/www/js/welcome_firststart.js',
|
||||||
],
|
],
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
$this->app->Tpl->Parse('AUFGABENPOPUP', 'welcome_firststart.tpl');
|
$this->app->Tpl->Parse('AUFGABENPOPUP', 'welcome_firststart.tpl');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($this->app->User->GetType() === 'admin') {
|
if($this->app->User->GetType() === 'admin') {
|
||||||
$this->app->Tpl->Set('COLROWTASKS', '6');
|
$this->app->Tpl->Set('COLROWTASKS', '6');
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user