From 6f8200893bea5f51262cda805e2201f828e0aaeb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 18 Mar 2016 15:02:37 +0100 Subject: [PATCH 1/5] FIX #4784 --- htdocs/projet/admin/project.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 31fa9221dd37455d51e704b831505c96c241726c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josep=20Llu=C3=ADs?= Date: Fri, 18 Mar 2016 16:47:28 +0100 Subject: [PATCH 2/5] Change of wrong key "Firsname" translation Change of wrong key "Firsname" to "Firstname" for translation --- htdocs/contact/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 5ac3234d6a7..ee4add6d4c5 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -127,7 +127,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), From b4e775dd351e058feb0ff820027d33709a1d259b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 18 Mar 2016 19:42:56 +0100 Subject: [PATCH 3/5] FIX Parsing of amount to pay vat --- htdocs/compta/tva/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index 674e800a168..74a98641772 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; } From f0eb8ac79467e34cb4ab5e3534a4b51b5c890941 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Mar 2016 19:13:27 +0100 Subject: [PATCH 4/5] Fix regression Product ref not visible --- htdocs/comm/propal/class/propal.class.php | 1 + htdocs/compta/facture/class/facture.class.php | 1 + 2 files changed, 2 insertions(+) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index bca97f09188..2bb01b894e8 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2836,6 +2836,7 @@ class Propal extends CommonObject $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/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index d2fdf68172c..bcc15e5c250 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1125,6 +1125,7 @@ class Facture extends CommonInvoice $line->label = $objp->custom_label; // deprecated $line->desc = $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 From 660f825a3465874bea3df3a119d35cd4adeb1d24 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Mar 2016 19:25:28 +0100 Subject: [PATCH 5/5] Fix regression description line not visible --- htdocs/comm/propal/class/propal.class.php | 1 + htdocs/commande/class/commande.class.php | 1 + htdocs/compta/facture/class/facture.class.php | 1 + 3 files changed, 3 insertions(+) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 2bb01b894e8..939054a06eb 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2833,6 +2833,7 @@ 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; diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 85d5c5cebc4..8b8777ef2f4 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1723,6 +1723,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 bcc15e5c250..ae368b3870b 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1124,6 +1124,7 @@ 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