lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support fk_parent into dictionary of ticket categories

Browse Source
This commit is contained in:
Laurent Destailleur 2021-07-07 18:30:10 +02:00
parent 34f1cfe575
commit 9d3f7c5cdd
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
htdocs/admin/dict.php
View File

@ -695,7 +695,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
$listfieldmodify = explode(',', $tabfieldinsert[$id]); $listfieldmodify = explode(',', $tabfieldinsert[$id]);
$listfieldvalue = explode(',', $tabfieldvalue[$id]); $listfieldvalue = explode(',', $tabfieldvalue[$id]);
// Check that all fields are filled // Check that all mandatory fields are filled
$ok = 1; $ok = 1;
foreach ($listfield as $f => $value) { foreach ($listfield as $f => $value) {
// Discard check of mandatory fields for country for some tables // Discard check of mandatory fields for country for some tables
@ -1341,6 +1341,9 @@ if ($id) {
if ($value == 'short_label') { if ($value == 'short_label') {
$valuetoshow = $langs->trans("ShortLabel"); $valuetoshow = $langs->trans("ShortLabel");
} }
if ($value == 'fk_parent') {
$valuetoshow = $langs->trans("ParentID"); $class = 'center';
}
if ($value == 'range_account') { if ($value == 'range_account') {
$valuetoshow = $langs->trans("Range"); $valuetoshow = $langs->trans("Range");
} }
@ -1686,6 +1689,9 @@ if ($id) {
if ($value == 'short_label') { if ($value == 'short_label') {
$valuetoshow = $langs->trans("ShortLabel"); $valuetoshow = $langs->trans("ShortLabel");
} }
if ($value == 'fk_parent') {
$valuetoshow = $langs->trans("ParentID"); $cssprefix = 'center ';
}
if ($value == 'range_account') { if ($value == 'range_account') {
$valuetoshow = $langs->trans("Range"); $valuetoshow = $langs->trans("Range");
} }
@ -1995,16 +2001,13 @@ if ($id) {
if ($value == 'position') { if ($value == 'position') {
$class .= ' right'; $class .= ' right';
} }
if ($value == 'localtax1_type') { if (in_array($value, array('localtax1_type', 'localtax2_type'))) {
$class .= ' nowrap';
}
if ($value == 'localtax2_type') {
$class .= ' nowrap'; $class .= ' nowrap';
} }
if ($value == 'pos') { if ($value == 'pos') {
$class .= ' right'; $class .= ' right';
} }
if ($value == 'use_default') { if (in_array($value, array('use_default', 'fk_parent'))) {
$class .= ' center'; $class .= ' center';
} }
if ($value == 'public') { if ($value == 'public') {
@ -2271,7 +2274,13 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
print '<td>'; print '<td>';
print $form->selectarray('source', $sourceList, (!empty($obj->{$value}) ? $obj->{$value}:'')); print $form->selectarray('source', $sourceList, (!empty($obj->{$value}) ? $obj->{$value}:''));
print '</td>'; print '</td>';
} elseif (in_array($value, array('public', 'use_default'))) {
// Fields 0/1 with a combo select Yes/No
print '<td class="center">';
print $form->selectyesno($value, (!empty($obj->{$value}) ? $obj->{$value}:''), 1);
print '</td>';
} elseif ($value == 'private') { } elseif ($value == 'private') {
// Fields 'no'/'yes' with a combo select Yes/No
print '<td>'; print '<td>';
print $form->selectyesno("private", (!empty($obj->{$value}) ? $obj->{$value}:'')); print $form->selectyesno("private", (!empty($obj->{$value}) ? $obj->{$value}:''));
print '</td>'; print '</td>';
@ -2367,7 +2376,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
print $form->selectExpenseRanges($obj->fk_range); print $form->selectExpenseRanges($obj->fk_range);
print '</td>'; print '</td>';
} else { } else {
$fieldValue = isset($obj->{$value}) ? $obj->{$value}:''; $fieldValue = isset($obj->{$value}) ? $obj->{$value}: '';
if ($value == 'sortorder') { if ($value == 'sortorder') {
$fieldlist[$field] = 'position'; $fieldlist[$field] = 'position';
@ -2377,15 +2386,21 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
if ($fieldlist[$field] == 'code') { if ($fieldlist[$field] == 'code') {
$class = 'maxwidth100'; $class = 'maxwidth100';
} }
if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'pos', 'use_default', 'affect', 'delay', 'position', 'public', 'sortorder', 'sens', 'category_type'))) { if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'pos', 'use_default', 'affect', 'delay', 'position', 'public', 'sortorder', 'sens', 'category_type', 'fk_parent'))) {
$class = 'maxwidth50 center'; $class = 'maxwidth50 center';
} }
if (in_array($fieldlist[$field], array('use_default', 'public'))) { if (in_array($fieldlist[$field], array('use_default', 'public', 'fk_parent'))) {
$classtd = 'center'; $classtd = 'center';
} }
if (in_array($fieldlist[$field], array('libelle', 'label', 'tracking'))) { if (in_array($fieldlist[$field], array('libelle', 'label', 'tracking'))) {
$class = 'quatrevingtpercent'; $class = 'quatrevingtpercent';
} }
// Fields that must be suggested as '0' instead of ''
if ($fieldlist[$field] == 'fk_parent') {
if (empty($fieldValue)) {
$fieldValue = '0';
}
}
print '<td class="'.$classtd.'">'; print '<td class="'.$classtd.'">';
$transfound = 0; $transfound = 0;
$transkey = ''; $transkey = '';

10
htdocs/core/modules/modTicket.class.php
View File

@ -127,19 +127,19 @@ class modTicket extends DolibarrModules
'tabsql' => array( 'tabsql' => array(
'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_type as f', 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_type as f',
'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_severity as f', 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_severity as f',
'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default, f.public FROM '.MAIN_DB_PREFIX.'c_ticket_category as f', 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default, f.public, f.fk_parent FROM '.MAIN_DB_PREFIX.'c_ticket_category as f',
'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_resolution as f' 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_resolution as f'
), ),
'tabsqlsort' => array("pos ASC", "pos ASC", "pos ASC", "pos ASC"), 'tabsqlsort' => array("pos ASC", "pos ASC", "pos ASC", "pos ASC"),
'tabfield' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public", "code,label,pos,use_default"), 'tabfield' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"),
'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public", "code,label,pos,use_default"), 'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"),
'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public", "code,label,pos,use_default"), 'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"),
'tabrowid' => array("rowid", "rowid", "rowid", "rowid"), 'tabrowid' => array("rowid", "rowid", "rowid", "rowid"),
'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled), 'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled),
'tabhelp' => array( 'tabhelp' => array(
array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")),
array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")),
array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"), 'public'=>$langs->trans("Enter0or1").'<br>'.$langs->trans("TicketGroupIsPublicDesc")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"), 'public'=>$langs->trans("Enter0or1").'<br>'.$langs->trans("TicketGroupIsPublicDesc"), 'fk_parent'=>$langs->trans("IfThisCategoryIsChildOfAnother")),
array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")) array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"))
), ),
); );

1
htdocs/langs/en_US/admin.lang
View File

@ -118,6 +118,7 @@ MultiCurrencySetup=Multi-currency setup
MenuLimits=Limits and accuracy MenuLimits=Limits and accuracy
MenuIdParent=Parent menu ID MenuIdParent=Parent menu ID
DetailMenuIdParent=ID of parent menu (empty for a top menu) DetailMenuIdParent=ID of parent menu (empty for a top menu)
ParentID=Parent ID
DetailPosition=Sort number to define menu position DetailPosition=Sort number to define menu position
AllMenus=All AllMenus=All
NotConfigured=Module/Application not configured NotConfigured=Module/Application not configured