diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 9d454bb5b1e..9e5a25982dd 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -219,21 +219,25 @@ function dolibarr_syslog($message, $level=LOG_ERR) /** \brief Affiche le header d'une fiche - \param links liens - \param active 0 par défaut - \param title titre ("" par defaut) + \param links Tableau de titre d'onglets + \param active 0=onglet non actif, 1=onglet actif + \param title Titre tabelau ("" par defaut) */ function dolibarr_fiche_head($links, $active=0, $title='') { print '
'."\n"; - if (strlen($title)) + // Affichage titre + if ($title) { $limittitle=30; - if (strlen($title) > $limittitle) print ''.substr($title,0,$limittitle).'...'; - else print ''.$title.''; + print ''; + if (strlen($title) > $limittitle) print substr($title,0,$limittitle).'...'; + else print $title; + print ''; } + // Affichage onglets for ($i = 0 ; $i < sizeof($links) ; $i++) { if ($links[$i][2] == 'image') @@ -254,6 +258,7 @@ function dolibarr_fiche_head($links, $active=0, $title='') } print "
\n"; + print '
'."\n\n"; } diff --git a/htdocs/lib/mysql.lib.php b/htdocs/lib/mysql.lib.php index bf73b287faf..d0b427d1339 100644 --- a/htdocs/lib/mysql.lib.php +++ b/htdocs/lib/mysql.lib.php @@ -179,6 +179,31 @@ class DoliDb return $this->db; } + + /** + \brief Renvoie la version du serveur + \return string Chaine version + */ + function getVersion() + { + $resql=$this->query('SELECT VERSION()'); + $row=$this->fetch_row($resql); + return $row[0]; + } + + + /** + \brief Renvoie l'id de la connection + \return string Id connection + */ + function getConnectId() + { + $resql=$this->query('SELECT CONNECTION_ID()'); + $row=$this->fetch_row($resql); + return $row[0]; + } + + /** \brief Création d'une nouvelle base de donnée \param database nom de la database à créer diff --git a/htdocs/product.class.php b/htdocs/product.class.php index d7e1f6735a8..85a89bb589f 100644 --- a/htdocs/product.class.php +++ b/htdocs/product.class.php @@ -404,17 +404,29 @@ class Product /** - * \brief Charge le produit/service en mémoire - * \param id id du produit/service à charger + * \brief Charge le produit/service en mémoire + * \param id Id du produit/service à charger + * \param ref Ref du produit/service à charger + * \return int <0 si ko, >0 si ok */ - function fetch ($id) + function fetch($id='',$ref='') { + global $langs; + + // Verification parametres + if (! $id && ! $ref) + { + $this->error=$langs->trans('ErrorWrongParameters'); + return -1; + } + $sql = "SELECT rowid, ref, label, description, note, price, tva_tx, envente,"; $sql.= " nbvente, fk_product_type, duration, seuil_stock_alerte"; - $sql.= " FROM ".MAIN_DB_PREFIX."product WHERE rowid = $id"; + $sql.= " FROM ".MAIN_DB_PREFIX."product"; + if ($id) $sql.= " WHERE rowid = ".$id; + if ($ref) $sql.= " WHERE ref = '".addslashes($ref)."'"; $result = $this->db->query($sql) ; - if ( $result ) { $result = $this->db->fetch_array(); @@ -451,7 +463,7 @@ class Product $this->db->free(); $sql = "SELECT reel, fk_entrepot"; - $sql .= " FROM ".MAIN_DB_PREFIX."product_stock WHERE fk_product = ".$id; + $sql .= " FROM ".MAIN_DB_PREFIX."product_stock WHERE fk_product = ".$this->id; $result = $this->db->query($sql) ; if ($result) { @@ -491,6 +503,43 @@ class Product } + /** + * \brief Charge les propriétés ref_previous et ref_next + * \param filter filtre + * \return int <0 si ko, >0 si ok + */ + function load_previous_next_ref($filtre='') + { + $sql = "SELECT MAX(ref)"; + $sql.= " FROM ".MAIN_DB_PREFIX."product"; + $sql.= " WHERE ref < '".addslashes($this->ref)."'"; + if ($filter) $sql.=" AND ".$filter; + $result = $this->db->query($sql) ; + if (! $result) + { + $this->error=$this->db->error(); + return -1; + } + $row = $this->db->fetch_row($result); + $this->ref_previous = $row[0]; + + $sql = "SELECT MIN(ref)"; + $sql.= " FROM ".MAIN_DB_PREFIX."product"; + $sql.= " WHERE ref > '".addslashes($this->ref)."'"; + if ($filter) $sql.=" AND ".$filter; + $result = $this->db->query($sql) ; + if (! $result) + { + $this->error=$this->db->error(); + return -2; + } + $row = $this->db->fetch_row($result); + $this->ref_next = $row[0]; + + return 1; + } + + /** * \brief Charge tableau des stats propale pour le produit/service * \param socid Id societe diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php index 8e7c39cbbc7..398d9f9fa4c 100644 --- a/htdocs/product/barcode.php +++ b/htdocs/product/barcode.php @@ -50,7 +50,8 @@ $types[1] = $langs->trans("Service"); llxHeader("","",$langs->trans("BarCode")); $product = new Product($db); -$result = $product->fetch($_GET["id"]); +if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]); +if ($_GET["id"]) $result = $product->fetch($_GET["id"]); $h=0; @@ -120,9 +121,20 @@ $h++; dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); print ''; + +// Reference print ''; -print ''; +print ''; print ''; + +// Libelle print ''; print ''; diff --git a/htdocs/product/document.php b/htdocs/product/document.php index a529382dad4..f1092d39bdf 100755 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -38,20 +38,23 @@ $user->getrights('produit'); if (!$user->rights->produit->lire) accessforbidden(); -$productid=empty($_GET['id']) ? 0 : intVal($_GET['id']); $action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action']; -if ($productid > 0) + +$product = new Product($db); +if ($_GET['id'] || $_GET["ref"]) { - $product = new Product($db); - if ($product->fetch($productid)) + if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]); + if ($_GET["id"]) $result = $product->fetch($_GET["id"]); + $prodref = sanitize_string($product->ref); $upload_dir = $conf->produit->dir_output.'/'.$prodref; } + /* * Action envoie fichier */ -if ( $_POST["sendit"] && $conf->upload) +if ($_POST["sendit"] && $conf->upload) { /* * Creation répertoire si n'existe pas @@ -79,7 +82,7 @@ if ( $_POST["sendit"] && $conf->upload) llxHeader(); -if ($productid > 0) +if ($product->id) { if ( $error_msg ) { @@ -157,7 +160,8 @@ if ($productid > 0) $hselected=$h; $h++; - dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); + $titre=$langs->trans("CardProduct".$product->type); + dolibarr_fiche_head($head, $hselected, $titre); // Construit liste des fichiers clearstatcache(); @@ -188,9 +192,23 @@ if ($productid > 0) // print '
'.$langs->trans("ErrorCanNotReadDir",$upload_dir).'
'; } - print '
'.$langs->trans("Ref").''.$product->ref.''.$langs->trans("Ref").''; +$product->load_previous_next_ref(); +$previous_ref = $product->ref_previous?''.img_previous().'':''; +$next_ref = $product->ref_next?''.img_next().'':''; +if ($previous_ref || $next_ref) print '
'; +print ''.$product->ref.''; +if ($previous_ref || $next_ref) print ''.$previous_ref.''.$next_ref.'
'; +print '
'.$langs->trans("Label").''.$product->libelle.'
'; - print ''; - print ''; + print '
'.$langs->trans("Ref").''.$product->ref.'
'.$langs->trans("Label").''.$product->libelle.'
'; + + // Reference + print ''; + print ''; + print ''; + + // Libelle + print ''; + print ''; print ''; print '
'.$langs->trans("Ref").''; + $product->load_previous_next_ref(); + $previous_ref = $product->ref_previous?''.img_previous().'':''; + $next_ref = $product->ref_next?''.img_next().'':''; + if ($previous_ref || $next_ref) print '
'; + print ''.$product->ref.''; + if ($previous_ref || $next_ref) print ''.$previous_ref.''.$next_ref.'
'; + print '
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("NbOfAttachedFiles").''.sizeof($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'
'; @@ -263,7 +281,6 @@ if ($productid > 0) } print ''; - print '
'; } else { diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 0d8841341d4..209b2a4da5b 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -44,15 +44,17 @@ if (!$user->rights->produit->lire) accessforbidden(); $types[0] = $langs->trans("Product"); $types[1] = $langs->trans("Service"); + /* * */ if ($_GET["action"] == 'fastappro') { - $product = new Product($db); - $product->fetch($_GET["id"]); - $result = $product->fastappro($user); - Header("Location: fiche.php?id=".$_GET["id"]); + $product = new Product($db); + $product->fetch($_GET["id"]); + $result = $product->fastappro($user); + Header("Location: fiche.php?id=".$_GET["id"]); + exit; } @@ -80,6 +82,7 @@ if ($_POST["action"] == 'add' && $user->rights->produit->creer) if ($id > 0) { Header("Location: fiche.php?id=$id"); + exit; } else { @@ -158,6 +161,8 @@ if ($_GET["action"] == 'clone' && $user->rights->produit->creer) $db->commit(); Header("Location: fiche.php?id=$id"); + $db->close(); + exit; } else if ($id == -3) { @@ -334,13 +339,14 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer) /* * Fiche produit */ -if ($_GET["id"]) +if ($_GET["id"] || $_GET["ref"]) { if ($_GET["action"] <> 're-edit') { $product = new Product($db); - $result = $product->fetch($_GET["id"]); + if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]); + if ($_GET["id"]) $result = $product->fetch($_GET["id"]); } if ( $result ) @@ -416,7 +422,10 @@ if ($_GET["id"]) $head[$h][1] = $langs->trans('Documents'); $h++; - dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); + + $titre=$langs->trans("CardProduct".$product->type); + dolibarr_fiche_head($head, $hselected, $titre); + print($mesg); @@ -429,8 +438,15 @@ if ($_GET["id"]) if ($product->type == 1) $nblignes++; // Reference - print ''.$langs->trans("Ref").''.$product->ref.''; - + print ''.$langs->trans("Ref").''; + $product->load_previous_next_ref(); + $previous_ref = $product->ref_previous?''.img_previous().'':''; + $next_ref = $product->ref_next?''.img_next().'':''; + if ($previous_ref || $next_ref) print '
'; + print ''.$product->ref.''; + if ($previous_ref || $next_ref) print ''.$previous_ref.''.$next_ref.'
'; + print ''; + if ($product->is_photo_available($conf->produit->dir_output)) { // Photo @@ -441,7 +457,7 @@ if ($_GET["id"]) print ''; - // Libellé + // Libelle print ''.$langs->trans("Label").''.$product->libelle.''; print ''; diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index af39747f104..fe84a0df243 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -137,16 +137,16 @@ llxHeader("","",$langs->trans("CardProduct".$product->type)); /* * Fiche produit */ -if ($_GET["id"]) +if ($_GET["id"] || $_GET["ref"]) { - - if ($_GET["action"] <> 're-edit') + if ($_GET["action"] <> 're-edit') { - $product = new Product($db); - $result = $product->fetch($_GET["id"]); + $product = new Product($db); + if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]); + if ($_GET["id"]) $result = $product->fetch($_GET["id"]); } - - if ( $result ) + + if ( $result ) { if ($_GET["action"] <> 'edit' && $_GET["action"] <> 're-edit') @@ -230,12 +230,28 @@ if ($_GET["id"]) $head[$h][1] = $langs->trans('Documents'); $h++; - dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); + $titre=$langs->trans("CardProduct".$product->type); + dolibarr_fiche_head($head, $hselected, $titre); - print ''; - print ''; - print ''; - print ''; + print '
'.$langs->trans("Ref").''.$product->ref.'
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("SellingPrice").''.price($product->price).'
'; + + // Reference + print ''; + print ''; + print ''; + + // Libelle + print ''; + + // Prix + print ''; // Statut print '
'.$langs->trans("Ref").''; + $product->load_previous_next_ref(); + $previous_ref = $product->ref_previous?''.img_previous().'':''; + $next_ref = $product->ref_next?''.img_next().'':''; + if ($previous_ref || $next_ref) print '
'; + print ''.$product->ref.''; + if ($previous_ref || $next_ref) print ''.$previous_ref.''.$next_ref.'
'; + print '
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("SellingPrice").''.price($product->price).'
'.$langs->trans("Status").''; diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php index 71444072e8c..df6bc7a377c 100644 --- a/htdocs/product/photos.php +++ b/htdocs/product/photos.php @@ -52,7 +52,7 @@ $types[1] = $langs->trans("Service"); * Actions */ -if ($_POST["sendit"] && defined('MAIN_UPLOAD_DOC') && MAIN_UPLOAD_DOC == 1) +if ($_POST["sendit"] && $conf->global->MAIN_UPLOAD_DOC) { if ($_GET["id"]) { @@ -80,11 +80,12 @@ if ($_GET["action"] == 'delete' && $_GET["file"]) llxHeader("","",$langs->trans("CardProduct0")); -if ($_GET["id"]) +if ($_GET["id"] || $_GET["ref"]) { $product = new Product($db); - $result = $product->fetch($_GET["id"]); + if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]); + if ($_GET["id"]) $result = $product->fetch($_GET["id"]); if ($result) { @@ -157,14 +158,26 @@ if ($_GET["id"]) $head[$h][1] = $langs->trans('Documents'); $h++; - dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); + $titre=$langs->trans("CardProduct".$product->type); + dolibarr_fiche_head($head, $hselected, $titre); print($mesg); print ''; + + // Reference print ''; - print ''; + print ''; print ''; + + // Libelle print ''; print ''; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index e324e55c2b8..23270f28d27 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -80,7 +80,8 @@ if ($_POST["action"] == 'update_price' && llxHeader("","",$langs->trans("Price")); $product = new Product($db); -$result = $product->fetch($_GET["id"]); +if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]); +if ($_GET["id"]) $result = $product->fetch($_GET["id"]); $h=0; @@ -146,12 +147,24 @@ $head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$product->id; $head[$h][1] = $langs->trans('Documents'); $h++; -dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); +$titre=$langs->trans("CardProduct".$product->type); +dolibarr_fiche_head($head, $hselected, $titre); print '
'.$langs->trans("Ref").''.$product->ref.''.$langs->trans("Ref").''; + $product->load_previous_next_ref(); + $previous_ref = $product->ref_previous?''.img_previous().'':''; + $next_ref = $product->ref_next?''.img_next().'':''; + if ($previous_ref || $next_ref) print '
'; + print ''.$product->ref.''; + if ($previous_ref || $next_ref) print ''.$previous_ref.''.$next_ref.'
'; + print '
'.$langs->trans("Label").''.$product->libelle.'
'; + +// Reference print ''; -print ''; +print ''; print ''; + +// Libelle print ''; print ''; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index e6c47183b66..d72fa43e8d6 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -47,16 +47,12 @@ $pagenext = $_GET["page"] + 1; if (! $sortorder) $sortorder="DESC"; if (! $sortfield) $sortfield="f.datef"; - +// Securite +$socid = 0; if ($user->societe_id > 0) { - $action = ''; $socid = $user->societe_id; } -else -{ - $socid = 0; -} /* @@ -67,10 +63,11 @@ else llxHeader(); -if ($_GET["id"]) +if ($_GET["id"] || $_GET["ref"]) { $product = new Product($db); - $result = $product->fetch($_GET["id"]); + if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]); + if ($_GET["id"]) $result = $product->fetch($_GET["id"]); if ($result > 0) { @@ -101,7 +98,6 @@ if ($_GET["id"]) } } - $head[$h][0] = DOL_URL_ROOT."/product/photos.php?id=".$product->id; $head[$h][1] = $langs->trans("Photos"); $h++; @@ -143,14 +139,24 @@ if ($_GET["id"]) $head[$h][1] = $langs->trans('Documents'); $h++; - dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); - + $titre=$langs->trans("CardProduct".$product->type); + dolibarr_fiche_head($head, $hselected, $titre); print '
'.$langs->trans("Ref").''.$product->ref.''.$langs->trans("Ref").''; +$product->load_previous_next_ref(); +$previous_ref = $product->ref_previous?''.img_previous().'':''; +$next_ref = $product->ref_next?''.img_next().'':''; +if ($previous_ref || $next_ref) print '
'; +print ''.$product->ref.''; +if ($previous_ref || $next_ref) print ''.$previous_ref.''.$next_ref.'
'; +print '
'.$langs->trans("Label").''.$product->libelle.'
'; + // Reference print ''; - print ''; + print ''; print ''; + + // Libelle print ''; print ''; @@ -163,10 +169,10 @@ if ($_GET["id"]) else print $langs->trans("NotOnSell"); print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print ''; // Propals diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index 7851f580eba..8fb14b4029e 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/fiche.php @@ -58,11 +58,11 @@ $mesg = ''; /* * */ - -if ($_GET["id"]) +if ($_GET["id"] || $_GET["ref"]) { $product = new Product($db); - $result = $product->fetch($_GET["id"]); + if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]); + if ($_GET["id"]) $result = $product->fetch($_GET["id"]); if ($result) { @@ -187,13 +187,24 @@ if ($_GET["id"]) $head[$h][1] = $langs->trans('Documents'); $h++; - dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); - + $titre=$langs->trans("CardProduct".$product->type); + dolibarr_fiche_head($head, $hselected, $titre); print '
'.$langs->trans("Ref").''.$product->ref.''.$langs->trans("Ref").''; + $product->load_previous_next_ref(); + $previous_ref = $product->ref_previous?''.img_previous().'':''; + $next_ref = $product->ref_next?''.img_next().'':''; + if ($previous_ref || $next_ref) print '
'; + print ''.$product->ref.''; + if ($previous_ref || $next_ref) print ''.$previous_ref.''.$next_ref.'
'; + print '
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("Referers").''.$langs->trans("NbOfCustomers").''.$langs->trans("NbOfReferers").''.$langs->trans("TotalQuantity").'
'.$langs->trans("Referers").''.$langs->trans("NbOfCustomers").''.$langs->trans("NbOfReferers").''.$langs->trans("TotalQuantity").'
'; + + // Reference print ''; - print ''; + print ''; print ''; + + // Libelle print ''; print ''; @@ -204,10 +215,10 @@ if ($_GET["id"]) else print $langs->trans("NotOnSell"); print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print ''; // Propals diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index d0b1d2d1e85..94833a00254 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -98,12 +98,13 @@ if ($_POST["action"] == "transfert_stock" && $_POST["cancel"] <> $langs->trans(" * Fiche stock * */ -if ($_GET["id"]) +if ($_GET["id"] || $_GET["ref"]) { - $product = new Product($db); + if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]); + if ($_GET["id"]) $result = $product->fetch($_GET["id"]); - if ( $product->fetch($_GET["id"])) + if ($result > 0) { $h=0; @@ -175,9 +176,16 @@ if ($_GET["id"]) // Reference print ''; - print ''; + print ''; print ''; - + // Libellé print ''; print ''; @@ -194,7 +202,7 @@ if ($_GET["id"]) // TVA $langs->load("bills"); - print ''; + print ''; // Stock if ($product->type == 0 && $conf->stock->enabled) @@ -221,9 +229,8 @@ if ($_GET["id"]) print "
'.$langs->trans("Ref").''.$product->ref.''.$langs->trans("Ref").''; + $product->load_previous_next_ref(); + $previous_ref = $product->ref_previous?''.img_previous().'':''; + $next_ref = $product->ref_next?''.img_next().'':''; + if ($previous_ref || $next_ref) print '
'; + print ''.$product->ref.''; + if ($previous_ref || $next_ref) print ''.$previous_ref.''.$next_ref.'
'; + print '
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("SellingPrice").''.price($product->price).'
'.$langs->trans("Referers").''.$langs->trans("NbOfCustomers").''.$langs->trans("NbOfReferers").''.$langs->trans("TotalQuantity").'
'.$langs->trans("Referers").''.$langs->trans("NbOfCustomers").''.$langs->trans("NbOfReferers").''.$langs->trans("TotalQuantity").'
'.$langs->trans("Ref").''.$product->ref.''.$langs->trans("Ref").''; + $product->load_previous_next_ref(); + $previous_ref = $product->ref_previous?''.img_previous().'':''; + $next_ref = $product->ref_next?''.img_next().'':''; + if ($previous_ref || $next_ref) print '
'; + print ''.$product->ref.''; + if ($previous_ref || $next_ref) print ''.$previous_ref.''.$next_ref.'
'; + print '
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("VATRate").''.$product->tva_tx.' %
'.$langs->trans("VATRate").''.$product->tva_tx.'%
"; /* - * Contenu des stocks - * - */ + * Contenu des stocks + */ print '
'; print ''; $sql = "SELECT e.rowid, e.label, ps.reel FROM ".MAIN_DB_PREFIX."entrepot as e, ".MAIN_DB_PREFIX."product_stock as ps"; @@ -249,9 +256,8 @@ if ($_GET["id"]) print ''; /* - * Correction du stock - * - */ + * Correction du stock + */ if ($_GET["action"] == "correction") { print_titre ("Correction du stock"); @@ -288,10 +294,10 @@ if ($_GET["id"]) print ''; } + /* - * Transfert de pièces - * - */ + * Transfert de pièces + */ if ($_GET["action"] == "transfert") { print_titre ("Transfert de stock"); @@ -344,13 +350,13 @@ if ($_GET["id"]) print ''; } + /* - * - * - */ + * + */ if ($_GET["action"] == "definir") { - print_titre ("Créer un stock"); + print_titre($langs->trans("SetStock")); print "id\" method=\"post\">\n"; print ''; print '
'.$langs->trans("Warehouse").'Valeur du stock
'; diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index d9bedd0c665..414b5670e86 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -401,10 +401,9 @@ a.tabTitle { color: white; font-weight: normal; padding: 0px 6px; - margin: 0em 0.5em; + margin: 0px 6px; text-decoration: none; white-space: nowrap; - border-right: 1px solid #555555; border-left: 1px solid #D8D8D8; border-top: 1px solid #D8D8D8; diff --git a/htdocs/theme/eldy/img/boule.png b/htdocs/theme/eldy/img/boule.png new file mode 100644 index 00000000000..dfa83acd50d Binary files /dev/null and b/htdocs/theme/eldy/img/boule.png differ diff --git a/htdocs/theme/eldy/img/next.png b/htdocs/theme/eldy/img/next.png index f8d4f4f3208..60cb1ff8816 100644 Binary files a/htdocs/theme/eldy/img/next.png and b/htdocs/theme/eldy/img/next.png differ diff --git a/htdocs/theme/eldy/img/previous.png b/htdocs/theme/eldy/img/previous.png index 70f0aed4c9a..b6d7d5c4d8a 100644 Binary files a/htdocs/theme/eldy/img/previous.png and b/htdocs/theme/eldy/img/previous.png differ