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

Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields

Browse Source
This commit is contained in:
jfefe 2013-02-18 13:39:00 +01:00
commit 2f4a80215b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/emailing.lib.php
View File

@ -31,6 +31,12 @@ function emailing_prepare_head($object)
{ {
global $user, $langs, $conf; global $user, $langs, $conf;
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing');
$h = 0; $h = 0;
$head = array(); $head = array();
@ -53,6 +59,8 @@ function emailing_prepare_head($object)
$head[$h][2] = 'info'; $head[$h][2] = 'info';
$h++; $h++;
complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing','remove');
return $head; return $head;
} }

10
htdocs/societe/soc.php
View File

@ -222,19 +222,20 @@ if (empty($reshook))
{ {
$langs->load("errors"); $langs->load("errors");
$error++; $errors[] = $langs->transcountry('ProfId'.$i, $object->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel); $error++; $errors[] = $langs->transcountry('ProfId'.$i, $object->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel);
$action = ($action=='add'?'create':'edit'); $action = (($action=='add'||$action=='create')?'create':'edit');
} }
} }
$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY'; $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
if (! $vallabel && ! empty($conf->global->$idprof_mandatory)) if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
{ {
$langs->load("errors"); $langs->load("errors");
$error++; $error++;
$errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $object->country_code)); $errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $object->country_code));
$action = ($action=='add'?'create':'edit'); $action = (($action=='add'||$action=='create')?'create':'edit');
} }
} }
} }
if (! $error) if (! $error)
@ -712,8 +713,7 @@ else
print "<br>\n"; print "<br>\n";
} }
dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
dol_htmloutput_errors($error,$errors);
print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc">'; print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc">';