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

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0

Browse Source 
Conflicts:
	htdocs/core/modules/modBarcode.class.php
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
This commit is contained in:
Laurent Destailleur 2021-07-16 14:05:42 +02:00
commit af1c43c70d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/modules/modBarcode.class.php
View File

@ -93,6 +93,7 @@ class modBarcode extends DolibarrModules
// Main menu entries // Main menu entries
$r = 0; $r = 0;
$this->menu[$r] = array( $this->menu[$r] = array(
'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode 'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'mainmenu'=>'tools', 'mainmenu'=>'tools',
@ -106,7 +107,7 @@ class modBarcode extends DolibarrModules
'enabled'=>'$conf->barcode->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. 'enabled'=>'$conf->barcode->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules 'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
'target'=>'', 'target'=>'',
'user'=>2, // 0=Menu for internal users, 1=external users, 2=both 'user'=>0, // 0=Menu for internal users, 1=external users, 2=both
); );
$r++; $r++;

13
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
View File

@ -220,13 +220,12 @@ class CommandeFournisseurDispatch extends CommonObject
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element); $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
if (!$notrigger) { if (!$notrigger) {
// Uncomment this and change MYOBJECT to your own tag if you // Call triggers
// want this action calls a trigger. $result=$this->call_trigger('LINERECEPTION_CREATE', $user);
if ($result < 0) {
//// Call triggers $error++;
//$result=$this->call_trigger('MYOBJECT_CREATE',$user); }
//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} // End call triggers
//// End call triggers
} }
} }