From f322c73dd7cd009158c2d3f3f1dacd74c3a54bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 19 Oct 2018 22:52:18 +0200 Subject: [PATCH 01/13] Update ajax.lib.php --- htdocs/core/lib/ajax.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index 1fc5e23ebb4..1e6330ba35a 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -547,7 +547,7 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, * @param string $text_on Text if on * @param string $text_off Text if off * @param array $input Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid')) - * @return void + * @return string html for button on/off */ function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input=array()) { From c4029f5e5fc5d596e2d26d63f0756b2d8be1c168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 21 Oct 2018 09:23:33 +0200 Subject: [PATCH 02/13] Update style.css.php --- htdocs/theme/md/style.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index fe947935ec5..c6560bef8e5 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2918,7 +2918,7 @@ div .tdtop { .boxstats130 { width: 135px; height: 48px; - padding: 3px + padding: 3px; } @media only screen and (max-width: 767px) { From 28c86a613d755b72bcecd9588431761a1e491727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 21 Oct 2018 09:39:07 +0200 Subject: [PATCH 03/13] Update style.css.php --- htdocs/theme/md/style.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index c6560bef8e5..618a9de6d7f 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3018,7 +3018,7 @@ tr.box_titre { white-space: nowrap; } -tr.box_titre td.boxclose { +tr.box_titre, td.boxclose { width: 30px; } img.boxhandle, img.boxclose { From 83e29511071b4bbb9d31ab6ceadba7750a757622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 21 Oct 2018 09:59:14 +0200 Subject: [PATCH 04/13] Update style.css.php --- htdocs/theme/md/style.css.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 618a9de6d7f..84384a9130e 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1262,7 +1262,7 @@ div#tmenu_tooltip { background: rgb(); /* - background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); + background-image: linear-gradient(to top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); @@ -1343,7 +1343,7 @@ ul.tmenu { /* t r b l */ ul.tmenu li { background: rgb(); /* - background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); + background-image: linear-gradient(to top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); @@ -1374,7 +1374,7 @@ li.tmenusel, li.tmenu:hover { background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.5) 0%, rgba(250,250,250,0) 100%) !important; background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0) 100%) !important; background-image: -ms-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important; - background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important; + background-image: linear-gradient(to bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important; background: rgb(); */ /* background: url() 50% 0 repeat-x !important; Nicer but problem when menu wrap on 2 lines */ @@ -1964,7 +1964,7 @@ td.ecmroot { background-image: -moz-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; background-image: -webkit-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; background-image: -ms-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; - background-image: linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; + background-image: linear-gradient(to bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; background: #FFF; background-repeat: repeat-x !important; @@ -2613,7 +2613,7 @@ div.pagination li.paginationafterarrows { /* Prepare to remove class pair - impair .noborder > tbody > tr:nth-child(even) td { - background: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: linear-gradient(to bottom, rgb() 85%, rgb() 100%); background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); @@ -2626,7 +2626,7 @@ div.pagination li.paginationafterarrows { } .noborder > tbody > tr:nth-child(odd) td { - background: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: linear-gradient(to bottom, rgb() 85%, rgb() 100%); background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); @@ -2867,7 +2867,7 @@ div .tdtop { /* Prepare to remove class pair - impair */ .noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) { - background: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: linear-gradient(to bottom, rgb() 85%, rgb() 100%); background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); @@ -2878,7 +2878,7 @@ div .tdtop { } .noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre) { - background: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: linear-gradient(to bottom, rgb() 85%, rgb() 100%); background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); From beb906b5f18fea0707d019a24dd185040c48248e Mon Sep 17 00:00:00 2001 From: fappels Date: Sun, 21 Oct 2018 22:52:53 +0200 Subject: [PATCH 05/13] Deprecate class property before removing it. --- htdocs/expedition/class/expeditionbatch.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php index 227566d8382..3df77b509e7 100644 --- a/htdocs/expedition/class/expeditionbatch.class.php +++ b/htdocs/expedition/class/expeditionbatch.class.php @@ -35,6 +35,7 @@ class ExpeditionLineBatch extends CommonObject var $eatby; var $batch; var $qty; + var $dluo_qty; // deprecated, use qty var $entrepot_id; var $fk_origin_stock; var $fk_expeditiondet; @@ -118,7 +119,7 @@ class ExpeditionLineBatch extends CommonObject $sql.= " ".(! isset($this->sellby) || dol_strlen($this->sellby)==0?'NULL':("'".$this->db->idate($this->sellby))."'").","; $sql.= " ".(! isset($this->eatby) || dol_strlen($this->eatby)==0?'NULL':("'".$this->db->idate($this->eatby))."'").","; $sql.= " ".(! isset($this->batch)?'NULL':("'".$this->db->escape($this->batch)."'")).","; - $sql.= " ".(! isset($this->qty)?'NULL':$this->qty).","; + $sql.= " ".(! isset($this->qty)?(! isset($this->dluo_qty)?'NULL':$this->dluo_qty):$this->qty).","; // dluo_qty deprecated, use qty $sql.= " ".(! isset($this->fk_origin_stock)?'NULL':$this->fk_origin_stock); $sql.= ")"; @@ -218,6 +219,7 @@ class ExpeditionLineBatch extends CommonObject $tmp->id = $obj->rowid; $tmp->fk_origin_stock = $obj->fk_origin_stock; $tmp->fk_expeditiondet = $obj->fk_expeditiondet; + $tmp->dluo_qty = $obj->qty; // dluo_qty deprecated, use qty $tmp->qty = $obj->qty; $ret[]=$tmp; From cf28e4e44210f11c0db950c0355a4da8f3099e8d Mon Sep 17 00:00:00 2001 From: ATM-Nicolas Date: Mon, 22 Oct 2018 15:19:33 +0200 Subject: [PATCH 06/13] FIX : Variable name --- htdocs/core/class/html.formprojet.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php index 524bd82ddd1..616355eab28 100644 --- a/htdocs/core/class/html.formprojet.class.php +++ b/htdocs/core/class/html.formprojet.class.php @@ -225,7 +225,7 @@ class FormProjets } else if ($obj->fk_statut == 2) { - if ($discard_close == 2) $disabled=1; + if ($discard_closed == 2) $disabled=1; $labeltoshow.=' - '.$langs->trans("Closed"); } else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid)) From bf46a35a31b357c08a1aa43cd64fc9ed660c0200 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Oct 2018 19:05:04 +0200 Subject: [PATCH 07/13] Fix size of key for extrafield of type select --- htdocs/core/class/extrafields.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index ae859181f67..1840f62ca5d 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -239,8 +239,8 @@ class ExtraFields $typedb='varchar'; $lengthdb='255'; } elseif (($type=='select') || ($type=='sellist') || ($type=='radio') ||($type=='checkbox') ||($type=='chkbxlst')){ - $typedb='text'; - $lengthdb=''; + $typedb='varchar'; + $lengthdb='255'; } elseif ($type=='link') { $typedb='int'; $lengthdb='11'; @@ -542,8 +542,8 @@ class ExtraFields $typedb='varchar'; $lengthdb='255'; } elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) { - $typedb='text'; - $lengthdb=''; + $typedb='varchar'; + $lengthdb='255'; } elseif ($type == 'html') { $typedb='text'; } elseif ($type=='link') { From 7bb5e7c31f4a95c27bfbdb311d40312ae9b5bdd9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Oct 2018 11:52:21 +0200 Subject: [PATCH 08/13] Fix responsive --- htdocs/product/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/list.php b/htdocs/product/list.php index d1ea3d08a4c..7c7619fe0d5 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -866,7 +866,7 @@ if ($resql) // Stock real if (! empty($arrayfields['p.stock']['checked'])) { - print ''; + print ''; if ($obj->fk_product_type != 1) { if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' '; @@ -878,7 +878,7 @@ if ($resql) // Stock virtual if (! empty($arrayfields['stock_virtual']['checked'])) { - print ''; + print ''; if ($obj->fk_product_type != 1) { if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' '; From b7d91c30d97823537538b4516d0c32e1b65b1a42 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Oct 2018 12:38:12 +0200 Subject: [PATCH 09/13] FIX missing symbol for indian rupies --- htdocs/install/mysql/data/llx_c_currencies.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index db1ba19aa6e..5f561f26ba0 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -80,7 +80,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'HNL' INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'HKD', '[36]', 1, 'Hong Kong Dollar'); INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'HUF', '[70,116]', 1, 'Hungary Forint'); INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ISK', '[107,114]', 1, 'Iceland Krona'); -INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'INR', NULL, 1, 'India Rupee'); +INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'INR', '[8377]', 1, 'India Rupee'); INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'IDR', '[82,112]', 1, 'Indonesia Rupiah'); INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'IRR', '[65020]', 1, 'Iran Rial'); INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'IMP', '[163]', 1, 'Isle of Man Pound'); From c8aa884462776ebea16c0ade7dd0775bbc4eadd4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Oct 2018 17:16:46 +0200 Subject: [PATCH 10/13] Fix search all --- htdocs/asset/list.php | 2 +- htdocs/comm/propal/list.php | 2 +- htdocs/commande/list.php | 2 +- htdocs/compta/bank/list.php | 2 +- htdocs/product/reassort.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php index bcc2329f870..5dc8b2c6866 100644 --- a/htdocs/asset/list.php +++ b/htdocs/asset/list.php @@ -317,7 +317,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print '
'.$langs->trans("FilterOnInto", $all) . join(', ',$fieldstosearchall).'
'; + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter = ''; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 65d132d5654..980615828a5 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -490,7 +490,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print '
'.$langs->trans("FilterOnInto", $all) . join(', ',$fieldstosearchall).'
'; + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $i = 0; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 3734ab18a93..a9da48fd626 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -529,7 +529,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print '
'.$langs->trans("FilterOnInto", $all) . join(', ',$fieldstosearchall).'
'; + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index e52e285742c..3a67a3d5309 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -257,7 +257,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print '
'.$langs->trans("FilterOnInto", $all) . join(', ',$fieldstosearchall).'
'; + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index 6403878d853..9ee9ab0aead 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -127,7 +127,7 @@ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s on p.rowid = s.fk_produc if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp"; $sql.= " WHERE p.entity IN (".getEntity('product').")"; if ($search_categ) $sql.= " AND p.rowid = cp.fk_product"; // Join for the needed table to filter by categ -if ($sall) $sql.=natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $all); +if ($sall) $sql.=natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $sall); // if the type is not 1, we show all products (type = 0,2,3) if (dol_strlen($type)) { From e39e57c5b9b51ba99d391703eac75ce119b1cb51 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Oct 2018 02:24:47 +0200 Subject: [PATCH 11/13] Update expeditionbatch.class.php --- htdocs/expedition/class/expeditionbatch.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php index 3df77b509e7..520f760aee0 100644 --- a/htdocs/expedition/class/expeditionbatch.class.php +++ b/htdocs/expedition/class/expeditionbatch.class.php @@ -119,7 +119,7 @@ class ExpeditionLineBatch extends CommonObject $sql.= " ".(! isset($this->sellby) || dol_strlen($this->sellby)==0?'NULL':("'".$this->db->idate($this->sellby))."'").","; $sql.= " ".(! isset($this->eatby) || dol_strlen($this->eatby)==0?'NULL':("'".$this->db->idate($this->eatby))."'").","; $sql.= " ".(! isset($this->batch)?'NULL':("'".$this->db->escape($this->batch)."'")).","; - $sql.= " ".(! isset($this->qty)?(! isset($this->dluo_qty)?'NULL':$this->dluo_qty):$this->qty).","; // dluo_qty deprecated, use qty + $sql.= " ".(! isset($this->qty)?((! isset($this->dluo_qty))?'NULL':$this->dluo_qty):$this->qty).","; // dluo_qty deprecated, use qty $sql.= " ".(! isset($this->fk_origin_stock)?'NULL':$this->fk_origin_stock); $sql.= ")"; From 2ba6f967651e62c9f550e1b5e68fed6073978781 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Oct 2018 02:27:59 +0200 Subject: [PATCH 12/13] Update style.css.php --- htdocs/theme/md/style.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 84384a9130e..b27bf4ad99c 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3018,7 +3018,7 @@ tr.box_titre { white-space: nowrap; } -tr.box_titre, td.boxclose { +tr.box_titre td.boxclose { width: 30px; } img.boxhandle, img.boxclose { From f0dc2df526b48a60e44204d91f268be44945121c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Oct 2018 03:30:06 +0200 Subject: [PATCH 13/13] Fix code comment --- htdocs/core/class/commondocgenerator.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index e944467ca27..18e2817f040 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -223,10 +223,10 @@ abstract class CommonDocGenerator /** * Define array with couple subtitution key => subtitution value * - * @param Contact $object contact + * @param Contact $object contact * @param Translate $outputlangs object for output - * @param array_key $array_key Name of the key for return array - * @return array of substitution key->code + * @param array $array_key Name of the key for return array + * @return array Array of substitution key->code */ function get_substitutionarray_contact($object, $outputlangs, $array_key = 'object') { global $conf; @@ -552,9 +552,9 @@ abstract class CommonDocGenerator /** * Define array with couple substitution key => substitution value * - * @param Expedition $object Main object to use as data source + * @param Expedition $object Main object to use as data source * @param Translate $outputlangs Lang object to use for output - * @param array_key $array_key Name of the key for return array + * @param array $array_key Name of the key for return array * @return array Array of substitution */ function get_substitutionarray_shipment($object,$outputlangs,$array_key='object') @@ -746,7 +746,7 @@ abstract class CommonDocGenerator /** * Rect pdf * - * @param PDF $pdf Object PDF + * @param TCPDF $pdf Object PDF * @param float $x Abscissa of first point * @param float $y Ordinate of first point * @param float $l ??