diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 19d7062a2e1..3769ce35d45 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2877,9 +2877,11 @@ class Propal extends CommonObject $this->lines[$i]->id = $obj->rowid; // for backward compatibility $this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->label = $obj->custom_label; + $this->lines[$i]->desc = $obj->description; $this->lines[$i]->description = $obj->description; $this->lines[$i]->fk_product = $obj->fk_product; $this->lines[$i]->ref = $obj->ref; + $this->lines[$i]->product_ref = $obj->ref; $this->lines[$i]->entity = $obj->entity; // Product entity $this->lines[$i]->product_label = $obj->product_label; $this->lines[$i]->product_desc = $obj->product_desc; diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 859af3fcb1d..f167a344c8b 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1740,6 +1740,7 @@ class Commande extends CommonOrder $line->commande_id = $objp->fk_commande; $line->label = $objp->custom_label; $line->desc = $objp->description; + $line->description = $objp->description; // Description line $line->product_type = $objp->product_type; $line->qty = $objp->qty; $line->tva_tx = $objp->tva_tx; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 1cca78c3204..a6b6ddf212c 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1182,7 +1182,9 @@ class Facture extends CommonInvoice $line->rowid = $objp->rowid; // deprecated $line->label = $objp->custom_label; // deprecated $line->desc = $objp->description; // Description line + $line->description = $objp->description; // Description line $line->product_type = $objp->product_type; // Type of line + $line->ref = $objp->product_ref; // Ref product $line->product_ref = $objp->product_ref; // Ref product $line->libelle = $objp->product_label; // TODO deprecated $line->product_label = $objp->product_label; // Label product diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index 7eac6abb3c2..f7d8361b8ff 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -71,7 +71,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel")) $tva->datev=$datev; $tva->datep=$datep; - $amount = GETPOST("amount"); + $amount = price2num(GETPOST("amount")); if ($refund == 1) { $amount= -$amount; } diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 38c24006cb8..cee89d0970f 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -126,7 +126,7 @@ $fieldstosearchall = array( // Definition of fields for list $arrayfields=array( 'p.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1), - 'p.firstname'=>array('label'=>$langs->trans("Firsname"), 'checked'=>1), + 'p.firstname'=>array('label'=>$langs->trans("Firstname"), 'checked'=>1), 'p.poste'=>array('label'=>$langs->trans("Post"), 'checked'=>1), 'p.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0), 'p.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0), diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 6c99461b353..ca351f7d1bb 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -508,7 +508,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) $file = $reg[1]; $classname = substr($file,4); - require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$file.'.php'; + require_once $dir.$file.'.php'; $module = new $file;