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

Fix: best method

Browse Source
This commit is contained in:
Regis Houssin 2012-11-30 00:29:13 +01:00
parent 5d1b5d5e0c
commit 969b510a6a
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/fourn/commande/fiche.php
View File

@ -82,10 +82,15 @@ if ($id > 0 || ! empty($ref))
if ($ret < 0) dol_print_error($db,$object->error); if ($ret < 0) dol_print_error($db,$object->error);
$ret = $object->fetch_thirdparty(); $ret = $object->fetch_thirdparty();
if ($ret < 0) dol_print_error($db,$object->error); if ($ret < 0) dol_print_error($db,$object->error);
} else if($socid) { }
$object->socid = $socid; else if (! empty($socid))
$resTP = $object->fetch_thirdparty(); {
if ($resTP < 0) dol_print_error($db,$object->error); $fourn = new Fournisseur($db);
$ret=$fourn->fetch($socid);
if ($ret < 0) dol_print_error($db,$object->error);
$object->socid = $fourn->id;
$ret = $object->fetch_thirdparty();
if ($ret < 0) dol_print_error($db,$object->error);
} }
/* /*
@ -652,19 +657,14 @@ else if ($action == 'remove_file' && $object->id > 0 && $user->rights->fournisse
/* /*
* Create an order * Create an order
*/ */
else if ($action == 'create' && $user->rights->fournisseur->commande->creer) else if ($action == 'create' && ! empty($object->socid) && $user->rights->fournisseur->commande->creer)
{ {
$error=0; $error=0;
$fourn = new Fournisseur($db);
$result=$fourn->fetch($socid);
$object->socid = $fourn->id;
$db->begin(); $db->begin();
$orderid=$object->create($user); $id=$object->create($user);
if (! $orderid > 0) if (! $id > 0)
{ {
$error++; $error++;
setEventMessage($object->error, 'errors'); setEventMessage($object->error, 'errors');
@ -674,10 +674,9 @@ else if ($action == 'create' && $user->rights->fournisseur->commande->creer)
{ {
if ($comclientid != '') if ($comclientid != '')
{ {
$object->updateFromCommandeClient($user, $orderid, $comclientid); $object->updateFromCommandeClient($user, $id, $comclientid);
} }
$id=$orderid;
$ret=$object->fetch($id); // Reload to get new records $ret=$object->fetch($id); // Reload to get new records
$db->commit(); $db->commit();