From 23415f0798ce648e18b4751d2523fb7cf2b06b71 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Thu, 14 Apr 2005 11:41:47 +0000 Subject: [PATCH] =?UTF-8?q?Gestion=20de=20la=20r=E9f=E9rence=20fournisseur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/fourn/product/fourn.php | 104 ++++++++++++++++----------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/htdocs/fourn/product/fourn.php b/htdocs/fourn/product/fourn.php index cad91bd7233..92e007d4a4a 100644 --- a/htdocs/fourn/product/fourn.php +++ b/htdocs/fourn/product/fourn.php @@ -29,17 +29,19 @@ require("./pre.inc.php"); -$langs->load("products"); -$user->getrights('produit'); +require_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.product.class.php"; if (!$user->rights->produit->lire) accessforbidden(); if ($_POST["action"] == 'update' && $_POST["cancel"] <> $langs->trans("Cancel")) { - $product = new Product($db); - if( $product->fetch($_GET["id"]) ) + + $product = new ProductFournisseur($db); + $result = $product->fetch($_GET["id"], $_GET["id_fourn"]); + + if( $result == 0 ) { - $product->update_buyprice($_GET["id_fourn"], '1', $_POST["price"], $user); + $product->update($_POST["fourn_ref"], '1', $_POST["price"], $user); } Header('Location :fourn.php?id='.$product->id.'&id_fourn='.$_GET["id_fourn"]); @@ -56,63 +58,61 @@ if ($_GET["id"]) { if ($_GET["action"] <> 're-edit') { - $product = new Product($db); - $result = $product->fetch($_GET["id"]); + $product = new ProductFournisseur($db); + $result = $product->fetch($_GET["id"], $_GET["id_fourn"]); - - $fourn = new Fournisseur($db); - $result = $fourn->fetch($_GET["id_fourn"]); - - $product->get_buyprice($fourn->id, 1); + $product->get_buyprice(1); } - if ( $result ) + if ( $result == 0) { - - /* - * En mode visu - */ + + /* + * En mode visu + */ + + $h=0; + + $head[$h][0] = DOL_URL_ROOT."/fourn/product/fiche.php?id=".$product->id; + $head[$h][1] = $langs->trans("ProductCard"); + $h++; + + $head[$h][0] = DOL_URL_ROOT."/fourn/product/fourn.php?id=".$product->id.'&id_fourn='.$_GET["id_fourn"]; + $head[$h][1] = $langs->trans("SupplierCard"); + $hselected = $h; + $h++; - $h=0; - - $head[$h][0] = DOL_URL_ROOT."/fourn/product/fiche.php?id=".$product->id; - $head[$h][1] = $langs->trans("ProductCard"); - $h++; - - $head[$h][0] = DOL_URL_ROOT."/fourn/product/fourn.php?id=".$product->id.'&id_fourn='.$_GET["id_fourn"]; - $head[$h][1] = $langs->trans("SupplierCard"); - $hselected = $h; - $h++; - - dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); - - print ''; - - if ($conf->categorie->enabled) - { - print ''; - print '
'; - $cat = new Categorie ($db); - $way = $cat->print_primary_way($product->id," > ",'fourn/product/liste.php'); - if ($way == "") - { - print "Ce produit n'appartient à aucune catégorie"; - } - else - { + dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); + + print ''; + + if ($conf->categorie->enabled) + { + print ''; + print ''; - } + print ''; + } print ""; print ''; print ''; print ''; print ""; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; @@ -151,7 +151,7 @@ if ($_GET["id"]) $sql = "SELECT p.price, p.quantity,".$db->pdate("tms") ." as date_releve"; $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as p"; - $sql .=" WHERE p.fk_soc = ".$fourn->id; + $sql .=" WHERE p.fk_soc = ".$product->fourn->id; $sql .= " AND p.fk_product = ".$product->id; $sql .= " ORDER BY p.quantity ASC"; $resql= $db->query($sql) ; @@ -185,7 +185,7 @@ if ($_GET["id"]) if (($_GET["action"] == 'edit' || $_GET["action"] == 're-edit') && $user->rights->produit->creer) { - $action = 'fourn.php?id='.$product->id.'&id_fourn='.$fourn->id; + $action = 'fourn.php?id='.$product->id.'&id_fourn='.$product->fourn->id; print ''; print ''; @@ -193,8 +193,8 @@ if ($_GET["id"]) print ''; print ''; - print ''; - print ''; + print ''; + print ''; print '
'; + $cat = new Categorie ($db); + $way = $cat->print_primary_way($product->id," > ",'fourn/product/liste.php'); + if ($way == "") + { + print "Ce produit n'appartient à aucune catégorie"; + } + else + { print $langs->trans("Categorie")." : "; print $way; } - print '
'.$langs->trans("InternalRef").''.$product->ref.'
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("Supplier").''.$fourn->nom_url.''.$langs->trans("Supplier").''.$product->fourn->nom_url.'
'.$langs->trans("SupplierRef").''.$product->fourn_ref.'
'.$langs->trans("BuiingPrice").''.price($product->buyprice).'
'.$langs->trans("Price").'
'.$langs->trans("Ref").'
'.$langs->trans("SupplierRef").'
'.$langs->trans("Description").''; print '