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

Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2

Browse Source
This commit is contained in:
Raphaël Doursenaud 2012-05-22 15:15:07 +02:00
commit 96294403e2
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/comm/mailing/cibles.php
View File

@ -151,13 +151,26 @@ if ($action == 'delete')
$sql="DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles where rowid=".$id; $sql="DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles where rowid=".$id;
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ { //on récurpére l'id du mailing
$file = $dirmod."/modules_mailings.php"; $id = GETPOST('id','int');
$classname = "MailingTargets";
require_once($file);
$obj = new $classname($db); if (!empty($id))
$obj->update_nb($id); {
$file = $dirmod."/modules_mailings.php";
$classname = "MailingTargets";
require_once($file);
$obj = new $classname($db);
$obj->update_nb($id);
Header("Location: cibles.php?id=".$id);
exit;
}
else
{
Header("Location: liste.php");
exit;
}
} }
else else
{ {

1
htdocs/fourn/facture/fiche.php
View File

@ -402,6 +402,7 @@ elseif ($action == 'update_line')
if ($_REQUEST['etat'] == '1' && ! $_REQUEST['cancel']) // si on valide la modification if ($_REQUEST['etat'] == '1' && ! $_REQUEST['cancel']) // si on valide la modification
{ {
$object->fetch($id); $object->fetch($id);
$object->fetch_thirdparty();
if ($_POST['puht']) if ($_POST['puht'])
{ {

11
htdocs/societe/soc.php
View File

@ -198,15 +198,18 @@ if (empty($reshook))
$action = ($action=='add'?'create':'edit'); $action = ($action=='add'?'create':'edit');
} }
// Check for duplicate prof id
for ($i = 1; $i < 3; $i++) for ($i = 1; $i < 3; $i++)
{ {
$slabel="idprof".$i; $slabel="idprof".$i;
if (($_POST[$slabel] && $object->id_prof_verifiable($i))) $_POST[$slabel]=trim($_POST[$slabel]);
$vallabel=$_POST[$slabel];
if ($vallabel && $object->id_prof_verifiable($i))
{ {
if($object->id_prof_exists($i,$_POST["$slabel"],$object->id)) if($object->id_prof_exists($i,$vallabel,$object->id))
{ {
$langs->load("errors"); $langs->load("errors");
$error++; $errors[] = $langs->transcountry('ProfId'.$i, $object->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $_POST[$slabel]); $error++; $errors[] = $langs->transcountry('ProfId'.$i, $object->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel);
$action = ($action=='add'?'create':'edit'); $action = ($action=='add'?'create':'edit');
} }
} }