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

Look: Modif esth閠iques mineures. Ajout du picto statut sur les produits

Browse Source
This commit is contained in:
Laurent Destailleur 2006-03-17 00:17:27 +00:00
parent d87bb979c8
commit 124fe2e2bc
2 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/index.php
View File

@ -38,7 +38,6 @@ if (! isset($_GET["mainmenu"])) $_GET["mainmenu"]="home";
llxHeader(); llxHeader();
print_fiche_titre($langs->trans("HomeArea")); print_fiche_titre($langs->trans("HomeArea"));

84
htdocs/product.class.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
@ -71,7 +71,6 @@ class Product
$this->db = $DB; $this->db = $DB;
$this->id = $id ; $this->id = $id ;
$this->envente = 0; // deprecated
$this->status = 0; $this->status = 0;
$this->seuil_stock_alerte = 0; $this->seuil_stock_alerte = 0;
@ -117,10 +116,9 @@ class Product
$this->ref = trim(sanitize_string($this->ref)); $this->ref = trim(sanitize_string($this->ref));
if (strlen($this->tva_tx)==0) $this->tva_tx = 0; if ($this->tva_tx=='') $this->tva_tx = 0;
if (strlen($this->price)==0) $this->price = 0; if ($this->price=='') $this->price = 0;
if (strlen($this->envente)==0) $this->envente = 0; // deprecated if ($this->status=='') $this->status = 0;
if (strlen($this->status)==0) $this->status = 0;
$this->price = price2num($this->price); $this->price = price2num($this->price);
dolibarr_syslog("Product::Create ref=".$this->ref." Categorie : ".$this->catid); dolibarr_syslog("Product::Create ref=".$this->ref." Categorie : ".$this->catid);
@ -660,7 +658,6 @@ class Product
$this->tva_tx = $result["tva_tx"]; $this->tva_tx = $result["tva_tx"];
$this->type = $result["fk_product_type"]; $this->type = $result["fk_product_type"];
$this->nbvente = $result["nbvente"]; $this->nbvente = $result["nbvente"];
$this->envente = $result["envente"]; // deprecated
$this->status = $result["envente"]; $this->status = $result["envente"];
$this->duration = $result["duration"]; $this->duration = $result["duration"];
$this->duration_value = substr($result["duration"],0,strlen($result["duration"])-1); $this->duration_value = substr($result["duration"],0,strlen($result["duration"])-1);
@ -1416,16 +1413,11 @@ function get_arbo_each_prod()
{ {
$this -> sousprods[$k]=$v; $this -> sousprods[$k]=$v;
} }
}
}
/** /**
* \brief Retourne le libell茅 du statut d'une facture (brouillon, valid茅e, abandonn茅e, pay茅e) * \brief Retourne le libell茅 du statut d'une facture (brouillon, valid茅e, abandonn茅e, pay茅e)
* \param mode 0=libell茅 long, 1=libell茅 court * \param mode 0=libell茅 long, 1=libell茅 court, 2=Picto + Libell茅 court
* \return string Libelle * \return string Libelle
*/ */
function getLibStatut($mode=0) function getLibStatut($mode=0)
@ -1436,40 +1428,52 @@ function get_arbo_each_prod()
/** /**
* \brief Renvoi le libell茅 d'un statut donne * \brief Renvoi le libell茅 d'un statut donne
* \param status Statut * \param status Statut
* \param mode 0=libell茅 long, 1=libell茅 court * \param mode 0=libell茅 long, 1=libell茅 court, 2=Picto + Libell茅 court
* \return string Libell茅 du statut * \return string Libell茅 du statut
*/ */
function LibStatut($status,$mode=0) function LibStatut($status,$mode=0)
{ {
global $langs; global $langs;
$langs->load('products'); $langs->load('products');
if ($status == 0) return $langs->trans('ProductStatusNotOnSell'.($mode?'Short':'')); if ($mode == 0)
if ($status == 1) return $langs->trans('ProductStatusOnSell'.($mode?'Short':'')); {
if ($status == 0) return $langs->trans('ProductStatusNotOnSellShort');
if ($status == 1) return $langs->trans('ProductStatusOnSellShort');
}
if ($mode == 1)
{
if ($status == 0) return $langs->trans('ProductStatusNotOnSell');
if ($status == 1) return $langs->trans('ProductStatusOnSell');
}
if ($mode == 2)
{
if ($status == 0) return img_picto($langs->trans('ProductStatusNotOnSell'),'statut5').' '.$langs->trans('ProductStatusNotOnSell');
if ($status == 1) return img_picto($langs->trans('ProductStatusOnSell'),'statut4').' '.$langs->trans('ProductStatusOnSell');
}
return $langs->trans('Unknown'); return $langs->trans('Unknown');
} }
/** /**
* \brief Entre un nombre de piece du produit en stock dans un entrep么t * \brief Entre un nombre de piece du produit en stock dans un entrep么t
* \param id_entrepot id de l'entrepot * \param id_entrepot id de l'entrepot
* \param nbpiece nombre de pieces * \param nbpiece nombre de pieces
*/ */
function create_stock($id_entrepot, $nbpiece) function create_stock($id_entrepot, $nbpiece)
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_stock ";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_stock "; $sql .= " (fk_product, fk_entrepot, reel)";
$sql .= " (fk_product, fk_entrepot, reel)"; $sql .= " VALUES ($this->id, $id_entrepot, $nbpiece)";
$sql .= " VALUES ($this->id, $id_entrepot, $nbpiece)";
if ($this->db->query($sql) )
if ($this->db->query($sql) ) {
{ return 1;
return 1; }
} else
else {
{ dolibarr_print_error($this->db);
dolibarr_print_error($this->db); return -1;
return -1; }
} }
}
/** /**