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

Merge pull request #12426 from frederic34/actioncomm_category

Browse Source 
NEW categories for actioncomm
This commit is contained in:
Laurent Destailleur 2020-01-15 14:21:54 +01:00 committed by GitHub
commit e938f46672
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 379 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/card.php
View File

@ -1747,7 +1747,7 @@ else
{ {
print '<tr><td>'.$langs->trans("Categories").'</td>'; print '<tr><td>'.$langs->trans("Categories").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
print $form->showCategories($object->id, 'member', 1); print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
print '</td></tr>'; print '</td></tr>';
} }

2
htdocs/adherents/subscription.php
View File

@ -531,7 +531,7 @@ if ($rowid > 0)
{ {
print '<tr><td>'.$langs->trans("Categories").'</td>'; print '<tr><td>'.$langs->trans("Categories").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
print $form->showCategories($object->id, 'member', 1); print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
print '</td></tr>'; print '</td></tr>';
} }

5
htdocs/categories/class/api_categories.class.php
View File

@ -48,6 +48,11 @@ class Categories extends DolibarrApi
3 => 'member', 3 => 'member',
4 => 'contact', 4 => 'contact',
5 => 'account', 5 => 'account',
//6 => 'project',
//7 => 'user',
//8 => 'bank_line',
//9 => 'warehouse',
//10 => 'actioncomm',
); );
/** /**

8
htdocs/categories/class/categorie.class.php
View File

@ -54,6 +54,7 @@ class Categorie extends CommonObject
const TYPE_ACCOUNT = 'bank_account'; const TYPE_ACCOUNT = 'bank_account';
const TYPE_BANK_LINE = 'bank_line'; const TYPE_BANK_LINE = 'bank_line';
const TYPE_WAREHOUSE = 'warehouse'; const TYPE_WAREHOUSE = 'warehouse';
const TYPE_ACTIONCOMM = 'actioncomm';
/** /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@ -77,6 +78,7 @@ class Categorie extends CommonObject
'user' => 7, 'user' => 7,
'bank_line' => 8, 'bank_line' => 8,
'warehouse' => 9, 'warehouse' => 9,
'actioncomm' => 10,
); );
/** /**
@ -93,6 +95,7 @@ class Categorie extends CommonObject
7 => 'user', 7 => 'user',
8 => 'bank_line', 8 => 'bank_line',
9 => 'warehouse', 9 => 'warehouse',
10 => 'actioncomm',
); );
/** /**
@ -111,6 +114,7 @@ class Categorie extends CommonObject
'bank_account' => 'account', 'bank_account' => 'account',
'project' => 'project', 'project' => 'project',
'warehouse'=> 'warehouse', 'warehouse'=> 'warehouse',
'actioncomm' => 'actioncomm',
); );
/** /**
@ -129,6 +133,7 @@ class Categorie extends CommonObject
'bank_account'=> 'account', 'bank_account'=> 'account',
'project' => 'project', 'project' => 'project',
'warehouse'=> 'warehouse', 'warehouse'=> 'warehouse',
'actioncomm' => 'actioncomm',
); );
/** /**
@ -147,6 +152,7 @@ class Categorie extends CommonObject
'bank_account' => 'Account', 'bank_account' => 'Account',
'project' => 'Project', 'project' => 'Project',
'warehouse'=> 'Entrepot', 'warehouse'=> 'Entrepot',
'actioncomm' => 'ActionComm',
); );
/** /**
@ -164,6 +170,7 @@ class Categorie extends CommonObject
'account' => 'bank_account', 'account' => 'bank_account',
'project' => 'projet', 'project' => 'projet',
'warehouse'=> 'entrepot', 'warehouse'=> 'entrepot',
'actioncomm' => 'actioncomm',
); );
/** /**
@ -214,6 +221,7 @@ class Categorie extends CommonObject
* @see Categorie::TYPE_PROJECT * @see Categorie::TYPE_PROJECT
* @see Categorie::TYPE_BANK_LINE * @see Categorie::TYPE_BANK_LINE
* @see Categorie::TYPE_WAREHOUSE * @see Categorie::TYPE_WAREHOUSE
* @see Categorie::TYPE_ACTIONCOMM
*/ */
public $type; public $type;

8
htdocs/categories/index.php
View File

@ -59,7 +59,13 @@ elseif ($type == Categorie::TYPE_ACCOUNT) { $title=$langs->trans("AccountsCate
elseif ($type == Categorie::TYPE_PROJECT) { $title=$langs->trans("ProjectsCategoriesArea"); $typetext='project'; } elseif ($type == Categorie::TYPE_PROJECT) { $title=$langs->trans("ProjectsCategoriesArea"); $typetext='project'; }
elseif ($type == Categorie::TYPE_USER) { $title=$langs->trans("UsersCategoriesArea"); $typetext='user'; } elseif ($type == Categorie::TYPE_USER) { $title=$langs->trans("UsersCategoriesArea"); $typetext='user'; }
elseif ($type == Categorie::TYPE_WAREHOUSE) { $title=$langs->trans("StocksCategoriesArea"); $typetext='warehouse'; } elseif ($type == Categorie::TYPE_WAREHOUSE) { $title=$langs->trans("StocksCategoriesArea"); $typetext='warehouse'; }
else { $title=$langs->trans("CategoriesArea"); $typetext='unknown'; } elseif ($type == Categorie::TYPE_ACTIONCOMM) {
$title = $langs->trans("ActionCommCategoriesArea");
$typetext = 'actioncomm';
} else {
$title = $langs->trans("CategoriesArea");
$typetext = 'unknown';
}
$arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js'); $arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css'); $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');

36
htdocs/comm/action/card.php
View File

@ -44,6 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("companies", "other", "commercial", "bills", "orders", "agenda")); $langs->loadLangs(array("companies", "other", "commercial", "bills", "orders", "agenda"));
@ -374,6 +375,10 @@ if (empty($reshook) && $action == 'add')
{ {
if (!$object->error) if (!$object->error)
{ {
// Category association
$categories = GETPOST('categories', 'array');
$object->setCategories($categories);
unset($_SESSION['assignedtouser']); unset($_SESSION['assignedtouser']);
$moreparam = ''; $moreparam = '';
@ -595,6 +600,10 @@ if (empty($reshook) && $action == 'update')
if ($result > 0) if ($result > 0)
{ {
// Category association
$categories = GETPOST('categories', 'array');
$object->setCategories($categories);
unset($_SESSION['assignedtouser']); unset($_SESSION['assignedtouser']);
$db->commit(); $db->commit();
@ -1000,6 +1009,14 @@ if ($action == 'create')
print '</td></tr>'; print '</td></tr>';
} }
if ($conf->categorie->enabled) {
// Categories
print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, '', 0, '100%');
print "</td></tr>";
}
print '</table>'; print '</table>';
@ -1411,6 +1428,19 @@ if ($id > 0)
print $form->select_dolusers($object->userdoneid > 0 ? $object->userdoneid : -1, 'doneby', 1); print $form->select_dolusers($object->userdoneid > 0 ? $object->userdoneid : -1, 'doneby', 1);
print '</td></tr>'; print '</td></tr>';
} }
// Tags-Categories
if ($conf->categorie->enabled) {
print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
$c = new Categorie($db);
$cats = $c->containing($object->id, Categorie::TYPE_ACTIONCOMM);
$arrayselected = array();
foreach ($cats as $cat) {
$arrayselected[] = $cat->id;
}
print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
print "</td></tr>";
}
print '</table>'; print '</table>';
@ -1717,6 +1747,12 @@ if ($id > 0)
} }
print '</td></tr>'; print '</td></tr>';
} }
// Categories
if ($conf->categorie->enabled) {
print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td colspan="3">';
print $form->showCategories($object->id, Categorie::TYPE_ACTIONCOMM, 1);
print "</td></tr>";
}
print '</table>'; print '</table>';

44
htdocs/comm/action/class/actioncomm.class.php
View File

@ -1510,6 +1510,50 @@ class ActionComm extends CommonObject
return $result; return $result;
} }
/**
* Sets object to supplied categories.
*
* Deletes object from existing categories not supplied.
* Adds it to non existing supplied categories.
* Existing categories are left untouch.
*
* @param int[]|int $categories Category or categories IDs
* @return void
*/
public function setCategories($categories)
{
// Handle single category
if (! is_array($categories)) {
$categories = array($categories);
}
// Get current categories
include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$c = new Categorie($this->db);
$existing = $c->containing($this->id, Categorie::TYPE_ACTIONCOMM, 'id');
// Diff
if (is_array($existing)) {
$to_del = array_diff($existing, $categories);
$to_add = array_diff($categories, $existing);
} else {
$to_del = array(); // Nothing to delete
$to_add = $categories;
}
// Process
foreach($to_del as $del) {
if ($c->fetch($del) > 0) {
$c->del_type($this, Categorie::TYPE_ACTIONCOMM);
}
}
foreach ($to_add as $add) {
if ($c->fetch($add) > 0) {
$c->add_type($this, Categorie::TYPE_ACTIONCOMM);
}
}
return;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**

2
htdocs/comm/card.php
View File

@ -491,7 +491,7 @@ if ($object->id > 0)
$langs->load("categories"); $langs->load("categories");
print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>'; print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
print '<td>'; print '<td>';
print $form->showCategories($object->id, 'customer', 1); print $form->showCategories($object->id, Categorie::TYPE_CUSTOMER, 1);
print "</td></tr>"; print "</td></tr>";
} }

2
htdocs/compta/bank/card.php
View File

@ -690,7 +690,7 @@ else
// Categories // Categories
if ($conf->categorie->enabled) { if ($conf->categorie->enabled) {
print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>'; print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
print $form->showCategories($object->id, 'bank_account', 1); print $form->showCategories($object->id, Categorie::TYPE_ACCOUNT, 1);
print "</td></tr>"; print "</td></tr>";
} }

2
htdocs/contact/card.php
View File

@ -1364,7 +1364,7 @@ else
if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) { if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
print $form->showCategories($object->id, 'contact', 1); print $form->showCategories($object->id, Categorie::TYPE_CONTACT, 1);
print '</td></tr>'; print '</td></tr>';
} }

327
htdocs/core/modules/modAgenda.class.php
View File

@ -219,165 +219,206 @@ class modAgenda extends DolibarrModules
); );
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=0', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=0',
'titre'=>'Actions', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'Actions',
'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda', 'mainmenu'=>'agenda',
'langs'=>'agenda', 'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda',
'position'=>100, 'langs'=>'agenda',
'perms'=>'$user->rights->agenda->myactions->read', 'position'=>100,
'enabled'=>'$conf->agenda->enabled', 'perms'=>'$user->rights->agenda->myactions->read',
'target'=>'', 'enabled'=>'$conf->agenda->enabled',
'user'=>2); 'target'=>'',
'user'=>2,
);
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=1', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=1',
'titre'=>'NewAction', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'NewAction',
'url'=>'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create', 'mainmenu'=>'agenda',
'langs'=>'commercial', 'url'=>'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create',
'position'=>101, 'langs'=>'commercial',
'perms'=>'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)', 'position'=>101,
'enabled'=>'$conf->agenda->enabled', 'perms'=>'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)',
'target'=>'', 'enabled'=>'$conf->agenda->enabled',
'user'=>2); 'target'=>'',
'user'=>2
);
$r++; $r++;
// Calendar // Calendar
$this->menu[$r]=array('fk_menu'=>'r=1', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=1',
'titre'=>'Calendar', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'Calendar',
'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda', 'mainmenu'=>'agenda',
'langs'=>'agenda', 'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda',
'position'=>140, 'langs'=>'agenda',
'perms'=>'$user->rights->agenda->myactions->read', 'position'=>140,
'enabled'=>'$conf->agenda->enabled', 'perms'=>'$user->rights->agenda->myactions->read',
'target'=>'', 'enabled'=>'$conf->agenda->enabled',
'user'=>2); 'target'=>'',
'user'=>2
);
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=3', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=3',
'titre'=>'MenuToDoMyActions', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'MenuToDoMyActions',
'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine', 'mainmenu'=>'agenda',
'langs'=>'agenda', 'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
'position'=>141, 'langs'=>'agenda',
'perms'=>'$user->rights->agenda->myactions->read', 'position'=>141,
'enabled'=>'$conf->agenda->enabled', 'perms'=>'$user->rights->agenda->myactions->read',
'target'=>'', 'enabled'=>'$conf->agenda->enabled',
'user'=>2); 'target'=>'',
'user'=>2
);
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=3', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=3',
'titre'=>'MenuDoneMyActions', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'MenuDoneMyActions',
'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine', 'mainmenu'=>'agenda',
'langs'=>'agenda', 'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
'position'=>142, 'langs'=>'agenda',
'perms'=>'$user->rights->agenda->myactions->read', 'position'=>142,
'enabled'=>'$conf->agenda->enabled', 'perms'=>'$user->rights->agenda->myactions->read',
'target'=>'', 'enabled'=>'$conf->agenda->enabled',
'user'=>2); 'target'=>'',
'user'=>2
);
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=3', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=3',
'titre'=>'MenuToDoActions', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'MenuToDoActions',
'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1', 'mainmenu'=>'agenda',
'langs'=>'agenda', 'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
'position'=>143, 'langs'=>'agenda',
'perms'=>'$user->rights->agenda->allactions->read', 'position'=>143,
'enabled'=>'$user->rights->agenda->allactions->read', 'perms'=>'$user->rights->agenda->allactions->read',
'target'=>'', 'enabled'=>'$user->rights->agenda->allactions->read',
'user'=>2); 'target'=>'',
'user'=>2
);
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=3', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=3',
'titre'=>'MenuDoneActions', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'MenuDoneActions',
'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1', 'mainmenu'=>'agenda',
'langs'=>'agenda', 'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
'position'=>144, 'langs'=>'agenda',
'perms'=>'$user->rights->agenda->allactions->read', 'position'=>144,
'enabled'=>'$user->rights->agenda->allactions->read', 'perms'=>'$user->rights->agenda->allactions->read',
'target'=>'', 'enabled'=>'$user->rights->agenda->allactions->read',
'user'=>2); 'target'=>'',
'user'=>2
);
// List // List
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=1', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=1',
'titre'=>'List', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'List',
'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda', 'mainmenu'=>'agenda',
'langs'=>'agenda', 'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda',
'position'=>110, 'langs'=>'agenda',
'perms'=>'$user->rights->agenda->myactions->read', 'position'=>110,
'enabled'=>'$conf->agenda->enabled', 'perms'=>'$user->rights->agenda->myactions->read',
'target'=>'', 'enabled'=>'$conf->agenda->enabled',
'user'=>2); 'target'=>'',
'user'=>2
);
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=8', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=8',
'titre'=>'MenuToDoMyActions', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'MenuToDoMyActions',
'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine', 'mainmenu'=>'agenda',
'langs'=>'agenda', 'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
'position'=>111, 'langs'=>'agenda',
'perms'=>'$user->rights->agenda->myactions->read', 'position'=>111,
'enabled'=>'$conf->agenda->enabled', 'perms'=>'$user->rights->agenda->myactions->read',
'target'=>'', 'enabled'=>'$conf->agenda->enabled',
'user'=>2); 'target'=>'',
'user'=>2
);
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=8', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=8',
'titre'=>'MenuDoneMyActions', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'MenuDoneMyActions',
'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine', 'mainmenu'=>'agenda',
'langs'=>'agenda', 'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
'position'=>112, 'langs'=>'agenda',
'perms'=>'$user->rights->agenda->myactions->read', 'position'=>112,
'enabled'=>'$conf->agenda->enabled', 'perms'=>'$user->rights->agenda->myactions->read',
'target'=>'', 'enabled'=>'$conf->agenda->enabled',
'user'=>2); 'target'=>'',
'user'=>2
);
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=8', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=8',
'titre'=>'MenuToDoActions', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'MenuToDoActions',
'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1', 'mainmenu'=>'agenda',
'langs'=>'agenda', 'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
'position'=>113, 'langs'=>'agenda',
'perms'=>'$user->rights->agenda->allactions->read', 'position'=>113,
'enabled'=>'$user->rights->agenda->allactions->read', 'perms'=>'$user->rights->agenda->allactions->read',
'target'=>'', 'enabled'=>'$user->rights->agenda->allactions->read',
'user'=>2); 'target'=>'',
'user'=>2
);
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=8', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=8',
'titre'=>'MenuDoneActions', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'MenuDoneActions',
'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1', 'mainmenu'=>'agenda',
'langs'=>'agenda', 'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
'position'=>114, 'langs'=>'agenda',
'perms'=>'$user->rights->agenda->allactions->read', 'position'=>114,
'enabled'=>'$user->rights->agenda->allactions->read', 'perms'=>'$user->rights->agenda->allactions->read',
'target'=>'', 'enabled'=>'$user->rights->agenda->allactions->read',
'user'=>2); 'target'=>'',
'user'=>2
);
$r++; $r++;
// Reports // Reports
$this->menu[$r]=array('fk_menu'=>'r=1', $this->menu[$r]=array(
'type'=>'left', 'fk_menu'=>'r=1',
'titre'=>'Reportings', 'type'=>'left',
'mainmenu'=>'agenda', 'titre'=>'Reportings',
'url'=>'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda', 'mainmenu'=>'agenda',
'langs'=>'agenda', 'url'=>'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda',
'position'=>160, 'langs'=>'agenda',
'perms'=>'$user->rights->agenda->allactions->read', 'position'=>160,
'enabled'=>'$conf->agenda->enabled', 'perms'=>'$user->rights->agenda->allactions->read',
'target'=>'', 'enabled'=>'$conf->agenda->enabled',
'user'=>2); 'target'=>'',
'user'=>2
);
$r++;
// Categories
$this->menu[$r]=array(
'fk_menu' => 'r=1',
'type' => 'left',
'titre' => 'Categories',
'mainmenu' => 'agenda',
'url'=>'/categories/index.php?mainmenu=agenda&amp;leftmenu=agenda&type=10',
'langs' => 'agenda',
'position' => 170,
'perms' => '$user->rights->agenda->allactions->read',
'enabled' => '$conf->categorie->enabled&&$conf->categorie->enabled',
'target' => '',
'user' => 2
);
$r++; $r++;

2
htdocs/fourn/card.php
View File

@ -312,7 +312,7 @@ if ($object->id > 0)
$langs->load("categories"); $langs->load("categories");
print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>'; print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
print '<td>'; print '<td>';
print $form->showCategories($object->id, 'supplier', 1); print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);
print "</td></tr>"; print "</td></tr>";
} }

16
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
View File

@ -59,6 +59,22 @@ create table llx_object_lang
ALTER TABLE llx_object_lang ADD UNIQUE INDEX uk_object_lang (fk_object, type_object, property, lang); ALTER TABLE llx_object_lang ADD UNIQUE INDEX uk_object_lang (fk_object, type_object, property, lang);
CREATE TABLE llx_categorie_actioncomm
(
fk_categorie integer NOT NULL,
fk_actioncomm integer NOT NULL,
import_key varchar(14)
) ENGINE=innodb;
ALTER TABLE llx_categorie_actioncomm ADD PRIMARY KEY pk_categorie_actioncomm (fk_categorie, fk_actioncomm);
ALTER TABLE llx_categorie_actioncomm ADD INDEX idx_categorie_actioncomm_fk_categorie (fk_categorie);
ALTER TABLE llx_categorie_actioncomm ADD INDEX idx_categorie_actioncomm_fk_actioncomm (fk_actioncomm);
ALTER TABLE llx_categorie_actioncomm ADD CONSTRAINT fk_categorie_actioncomm_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
ALTER TABLE llx_categorie_actioncomm ADD CONSTRAINT fk_categorie_actioncomm_fk_actioncomm FOREIGN KEY (fk_actioncomm) REFERENCES llx_actioncomm (id);
ALTER TABLE llx_accounting_account ADD COLUMN labelshort varchar(255) DEFAULT NULL after label; ALTER TABLE llx_accounting_account ADD COLUMN labelshort varchar(255) DEFAULT NULL after label;

25
htdocs/install/mysql/tables/llx_categorie_actioncomm.key.sql Normal file
View File

@ -0,0 +1,25 @@
-- ============================================================================
-- Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com>
-- Copyright (C) 2016-2019 Frédéric France <frederic.france@netlogic.fr>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU 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 General Public License for more details.
--
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <https://www.gnu.org/licenses/>.
--
-- ============================================================================
ALTER TABLE llx_categorie_actioncomm ADD PRIMARY KEY pk_categorie_actioncomm (fk_categorie, fk_actioncomm);
ALTER TABLE llx_categorie_actioncomm ADD INDEX idx_categorie_actioncomm_fk_categorie (fk_categorie);
ALTER TABLE llx_categorie_actioncomm ADD INDEX idx_categorie_actioncomm_fk_actioncomm (fk_actioncomm);
ALTER TABLE llx_categorie_actioncomm ADD CONSTRAINT fk_categorie_actioncomm_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
ALTER TABLE llx_categorie_actioncomm ADD CONSTRAINT fk_categorie_actioncomm_fk_actioncomm FOREIGN KEY (fk_actioncomm) REFERENCES llx_actioncomm (id);

26
htdocs/install/mysql/tables/llx_categorie_actioncomm.sql Normal file
View File

@ -0,0 +1,26 @@
-- ============================================================================
-- Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com>
-- Copyright (C) 2016-2019 Frédéric France <frederic.france@netlogic.fr>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU 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 General Public License for more details.
--
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <https://www.gnu.org/licenses/>.
--
-- Table to link actioncomm tag/categories with actioncomms
-- ===========================================================================
CREATE TABLE llx_categorie_actioncomm
(
fk_categorie integer NOT NULL,
fk_actioncomm integer NOT NULL,
import_key varchar(14)
) ENGINE=innodb;

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

@ -90,4 +90,5 @@ ShowCategory=Show tag/category
ByDefaultInList=By default in list ByDefaultInList=By default in list
ChooseCategory=Choose category ChooseCategory=Choose category
StocksCategoriesArea=Warehouses Categories Area StocksCategoriesArea=Warehouses Categories Area
ActionCommCategoriesArea=Events Categories Area
UseOrOperatorForCategories=Use or operator for categories UseOrOperatorForCategories=Use or operator for categories

2
htdocs/product/card.php
View File

@ -1992,7 +1992,7 @@ else
// Categories // Categories
if ($conf->categorie->enabled) { if ($conf->categorie->enabled) {
print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td colspan="3">'; print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td colspan="3">';
print $form->showCategories($object->id, 'product', 1); print $form->showCategories($object->id, Categorie::TYPE_PRODUCT, 1);
print "</td></tr>"; print "</td></tr>";
} }

2
htdocs/product/stock/card.php
View File

@ -454,7 +454,7 @@ else
// Categories // Categories
if ($conf->categorie->enabled) { if ($conf->categorie->enabled) {
print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">'; print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
print $form->showCategories($object->id, 'warehouse', 1); print $form->showCategories($object->id, Categorie::TYPE_WAREHOUSE, 1);
print "</td></tr>"; print "</td></tr>";
} }
print "</table>"; print "</table>";

2
htdocs/projet/card.php
View File

@ -1086,7 +1086,7 @@ elseif ($object->id > 0)
// Categories // Categories
if ($conf->categorie->enabled) { if ($conf->categorie->enabled) {
print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>'; print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
print $form->showCategories($object->id, 'project', 1); print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
print "</td></tr>"; print "</td></tr>";
} }

2
htdocs/projet/comment.php
View File

@ -160,7 +160,7 @@ print '</td></tr>';
// Categories // Categories
if ($conf->categorie->enabled) { if ($conf->categorie->enabled) {
print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>'; print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
print $form->showCategories($object->id, 'project', 1); print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
print "</td></tr>"; print "</td></tr>";
} }

2
htdocs/projet/contact.php
View File

@ -271,7 +271,7 @@ if ($id > 0 || ! empty($ref))
// Categories // Categories
if ($conf->categorie->enabled) { if ($conf->categorie->enabled) {
print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>'; print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
print $form->showCategories($object->id, 'project', 1); print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
print "</td></tr>"; print "</td></tr>";
} }

2
htdocs/projet/element.php
View File

@ -247,7 +247,7 @@ print '</td></tr>';
// Categories // Categories
if ($conf->categorie->enabled) { if ($conf->categorie->enabled) {
print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>'; print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
print $form->showCategories($object->id, 'project', 1); print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
print "</td></tr>"; print "</td></tr>";
} }

2
htdocs/projet/ganttview.php
View File

@ -204,7 +204,7 @@ if (($id > 0 && is_numeric($id)) || !empty($ref))
// Categories // Categories
if ($conf->categorie->enabled) { if ($conf->categorie->enabled) {
print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>'; print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
print $form->showCategories($object->id, 'project', 1); print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
print "</td></tr>"; print "</td></tr>";
} }

2
htdocs/projet/tasks.php
View File

@ -479,7 +479,7 @@ if ($id > 0 || !empty($ref))
// Categories // Categories
if ($conf->categorie->enabled) { if ($conf->categorie->enabled) {
print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>'; print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
print $form->showCategories($object->id, 'project', 1); print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
print "</td></tr>"; print "</td></tr>";
} }

4
htdocs/societe/card.php
View File

@ -2561,7 +2561,7 @@ else
if ($object->prospect || $object->client || (!$object->fournisseur && !empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) { if ($object->prospect || $object->client || (!$object->fournisseur && !empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>'; print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
print '<td>'; print '<td>';
print $form->showCategories($object->id, 'customer', 1); print $form->showCategories($object->id, Categorie::TYPE_CUSTOMER, 1);
print "</td></tr>"; print "</td></tr>";
} }
@ -2569,7 +2569,7 @@ else
if ($object->fournisseur) { if ($object->fournisseur) {
print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>'; print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
print '<td>'; print '<td>';
print $form->showCategories($object->id, 'supplier', 1); print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);
print "</td></tr>"; print "</td></tr>";
} }
} }

4
htdocs/user/card.php
View File

@ -1772,7 +1772,7 @@ else
{ {
print '<tr><td>'.$langs->trans("Categories").'</td>'; print '<tr><td>'.$langs->trans("Categories").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
print $form->showCategories($object->id, 'user', 1); print $form->showCategories($object->id, Categorie::TYPE_USER, 1);
print '</td></tr>'; print '</td></tr>';
} }
@ -2633,7 +2633,7 @@ else
{ {
print $form->multiselectarray('usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%'); print $form->multiselectarray('usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
} else { } else {
print $form->showCategories($object->id, 'user', 1); print $form->showCategories($object->id, Categorie::TYPE_USER, 1);
} }
print "</td></tr>"; print "</td></tr>";
} }