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

Maj squelette

Browse Source
This commit is contained in:
Laurent Destailleur 2014-08-14 17:27:28 +02:00
parent c17f5e7f00
commit c79fc516d3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/skeletons/skeleton_page.php
View File

@ -63,7 +63,7 @@ if ($user->societe_id > 0)
// Load object if id or ref is provided as parameter // Load object if id or ref is provided as parameter
$object=new Skeleton_Class($db); $object=new Skeleton_Class($db);
if (($id || $ref) && $action != 'add') if (($id > 0 || ! empty($ref)) && $action != 'add')
{ {
$result=$object->fetch($id,$ref); $result=$object->fetch($id,$ref);
if ($result < 0) dol_print_error($db); if ($result < 0) dol_print_error($db);

4
htdocs/core/tpl/notes.tpl.php
View File

@ -22,6 +22,7 @@ $note_public = 'note_public';
$note_private = 'note_private'; $note_private = 'note_private';
$colwidth=(isset($colwidth)?$colwidth:25); $colwidth=(isset($colwidth)?$colwidth:25);
$permission=(isset($permission)?$permission:(isset($user->rights->$module->creer)?$user->rights->$module->creer:0)); // If already defined by caller page $permission=(isset($permission)?$permission:(isset($user->rights->$module->creer)?$user->rights->$module->creer:0)); // If already defined by caller page
$moreparam=(isset($moreparam)?$moreparam:''); $moreparam=(isset($moreparam)?$moreparam:'');
$value_public=$object->note_public; $value_public=$object->note_public;
@ -59,8 +60,9 @@ elseif ($module == 'contact') { $permission=$user->rights->societe->creer;}
elseif ($module == 'shipping') { $permission=$user->rights->expedition->creer;} elseif ($module == 'shipping') { $permission=$user->rights->expedition->creer;}
//else dol_print_error('','Bad value '.$module.' for param module'); //else dol_print_error('','Bad value '.$module.' for param module');
if (! empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata='ckeditor:dolibarr_notes:100%:200::1:12:100'; if (! empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata='ckeditor:dolibarr_notes:100%:200::1:12:100'; // Rem: This var is for all notes, not only thirdparties note.
else $typeofdata='textarea:12:100'; else $typeofdata='textarea:12:100';
?> ?>
<!-- BEGIN PHP TEMPLATE NOTES --> <!-- BEGIN PHP TEMPLATE NOTES -->