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

Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1

Browse Source
This commit is contained in:
Laurent Destailleur 2011-11-18 13:11:24 +01:00
commit 6d78f7e641
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/photos_resize.php
View File

@ -33,6 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
$langs->load("products");
$langs->load("other");
$modulepart=$_REQUEST['modulepart']?$_REQUEST['modulepart']:'produit|service';
if (isset($_GET["id"]))

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

@ -133,6 +133,12 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
dol_print_error($db,$object->error);
exit;
}
if ($object->socid)
{
$societe=new Societe($db);
$societe->fetch($object->socid);
}
// Ecrase $pu par celui du produit
// Ecrase $desc par celui du produit
@ -145,11 +151,11 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
$idprod=$product->get_buyprice($_POST['idprodfournprice'], $qty);
//$societe='';
if ($object->socid)
/*if ($object->socid)
{
$societe=new Societe($db);
$societe->fetch($object->socid);
}
}*/
if ($idprod > 0)
{