From 965f5861b3d795ba84008c129036f28e66bce33c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 14 Mar 2019 09:10:26 +0100 Subject: [PATCH 1/4] Update commoninvoice.class.php --- htdocs/core/class/commoninvoice.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index ec2f539369f..8ea15b31938 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -517,7 +517,6 @@ abstract class CommonInvoice extends CommonObject return dolGetStatus($labelstatut, $labelstatutShort, '', $statusType, $mode); - } // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps From ba749ffc8cd082e4eb1a014e71d9e2a3d4c0c0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 14 Mar 2019 09:14:29 +0100 Subject: [PATCH 2/4] Update product.class.php --- htdocs/product/class/product.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8d446682dfd..f186c1d21da 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -4168,7 +4168,7 @@ class Product extends CommonObject case 2: return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 1, 2); case 3: - return dolGetStatus($langs->trans('ProductStatusNotOnBatch'), '','',empty($status)?'status5':'status4',3,'dot'); + return dolGetStatus($langs->trans('ProductStatusNotOnBatch'), '', '', empty($status)?'status5':'status4', 3, 'dot'); case 4: return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 0, 2); case 5: @@ -4213,11 +4213,11 @@ class Product extends CommonObject if($mode>6){ - return dolGetStatus($langs->trans('Unknown'),'', '', 'status0', 0); + return dolGetStatus($langs->trans('Unknown'), '', '', 'status0', 0); } else{ return dolGetStatus($labelstatut, $labelstatutShort, '', $statuttrans, $mode); - } + } } From bb14562f7b3cf950a5ffd7c6e49daf79f05001f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 14 Mar 2019 09:17:40 +0100 Subject: [PATCH 3/4] Update global.inc.php --- htdocs/theme/eldy/global.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 1cbda302574..ae557aeb885 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1630,7 +1630,7 @@ a.tmenuimage:hover{ else { print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n"; - $url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic,4))."_over.png", 1); + $url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1); print "div.mainmenu.".$val." {\n"; print " background-image: url(".$url.");\n"; print "}\n"; From 9be780f47df4622a24831d1bbed137b50d939b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 14 Mar 2019 09:18:51 +0100 Subject: [PATCH 4/4] 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 a294ddf4b86..cebdaad8164 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1824,7 +1824,7 @@ foreach($mainmenuusedarray as $val) else { print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n"; - $url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic,4))."_over.png", 1); + $url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1); print "div.mainmenu.".$val." {\n"; print " background-image: url(".$url.");\n"; print "}\n";