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

Merge remote-tracking branch 'dol/13.0' into FIX_13.0_extrafields_inoperative_in_receptions

Browse Source
This commit is contained in:
atm-florian 2021-07-19 09:50:31 +02:00
commit c92278b4df
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,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.
'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'=>'',
'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++;
$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode

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

@ -204,8 +204,8 @@ class CommandeFournisseurDispatch extends CommonObject
// want this action calls a trigger.
//// Call triggers
//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
$result=$this->call_trigger('LINERECEPTION_CREATE', $user);
if ($result < 0) $error++;
//// End call triggers
}
}
@ -419,8 +419,8 @@ class CommandeFournisseurDispatch extends CommonObject
// want this action calls a trigger.
//// Call triggers
//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
$result=$this->call_trigger('LINERECEPTION_DELETE', $user);
if ($result < 0) $error++;
//// End call triggers
}
}