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

modification de la description produit

Browse Source
This commit is contained in:
Regis Houssin 2006-02-12 13:45:39 +00:00
parent 5004d52a77
commit cce7796626
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/facture.php
View File

@ -336,6 +336,7 @@ if ($_POST['action'] == 'addligne' && $user->rights->facture->creer)
} }
$result = $fac->addline($_POST['facid'], $result = $fac->addline($_POST['facid'],
$_POST['desc'], $_POST['desc'],
$_POST['product_desc'],
$_POST['pu'], $_POST['pu'],
$_POST['qty'], $_POST['qty'],
$_POST['tva_tx'], $_POST['tva_tx'],

14
htdocs/facture.class.php
View File

@ -977,7 +977,7 @@ class Facture
* \param dateend date de fin de validité du service * \param dateend date de fin de validité du service
* \param ventil code de ventilation comptable * \param ventil code de ventilation comptable
*/ */
function addline($facid, $desc, $pu, $qty, $txtva, $fk_product=0, $remise_percent=0, $datestart='', $dateend='', $ventil = 0) function addline($facid, $desc, $product_desc, $pu, $qty, $txtva, $fk_product=0, $remise_percent=0, $datestart='', $dateend='', $ventil = 0)
{ {
global $conf; global $conf;
dolibarr_syslog("facture.class.php::addline($facid,$desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$datestart,$dateend,$ventil)"); dolibarr_syslog("facture.class.php::addline($facid,$desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$datestart,$dateend,$ventil)");
@ -992,6 +992,7 @@ class Facture
{ {
$prod = new Product($this->db, $fk_product); $prod = new Product($this->db, $fk_product);
$prod->fetch($fk_product); $prod->fetch($fk_product);
$product_desc = $prod->description;
// multiprix // multiprix
if($conf->global->PRODUIT_MULTIPRICES == 1) if($conf->global->PRODUIT_MULTIPRICES == 1)
{ {
@ -1041,7 +1042,16 @@ class Facture
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facturedet '; $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facturedet ';
$sql.= ' (fk_facture, description, price, qty, tva_taux, fk_product, remise_percent, subprice, remise, date_start, date_end, fk_code_ventilation, rang)'; $sql.= ' (fk_facture, description, price, qty, tva_taux, fk_product, remise_percent, subprice, remise, date_start, date_end, fk_code_ventilation, rang)';
$sql.= " VALUES ($facid, '".addslashes($desc)."','$price','$qty','$txtva',";
if ($conf->global->CHANGE_PROD_DESC)
{
$sql.= " VALUES ($facid, '".addslashes($product_desc)."','$price','$qty','$txtva',";
}
else
{
$sql.= " VALUES ($facid, '".addslashes($desc)."','$price','$qty','$txtva',";
}
if ($fk_product) { $sql.= "'$fk_product',"; } if ($fk_product) { $sql.= "'$fk_product',"; }
else { $sql.='0,'; } else { $sql.='0,'; }
$sql.= " '$remise_percent','$subprice','$remise',"; $sql.= " '$remise_percent','$subprice','$remise',";