diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php index ddc51aa79fe..315293281cc 100644 --- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php +++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php @@ -131,7 +131,9 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes $mesg = $px1->isGraphKo(); if (! $mesg) { - $px1->SetData($data1); + $langs->load("bills"); + + $px1->SetData($data1); unset($data1); $px1->SetPrecisionY(0); $i=$startyear;$legend=array(); diff --git a/htdocs/index.php b/htdocs/index.php index 86ea10b801f..0e44483118a 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -530,26 +530,23 @@ $boxwork.='
'; $boxwork.=''."\n"; $boxwork.=''; $boxwork.=''; -//$boxwork.=''; -//$boxwork.=''; -//$boxwork.=''; -//print ''; -//if ($showweather) $boxwork.=''; $boxwork.=''."\n"; if ($showweather) -{/* +{ $boxwork.=''; $boxwork.=''; - $boxwork.='';*/ + $boxwork.=''; } -$boxwork.='
'.$langs->trans("DolibarrWorkBoard").''.$langs->trans("Number").''.$form->textwithpicto($langs->trans("Late"),$langs->trans("LateDesc")).'   
'; $text=''; if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')'; + $text.='. '.$langs->trans("LateDesc"); + //$text.=$form->textwithpicto('',$langs->trans("LateDesc")); $options='height="64px"'; $boxwork.=showWeather($totallate,$text,$options); $boxwork.='
'; +$boxwork.='
'; // Show dashboard $nbworkboardempty=0; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 47f66cd917e..b8ba74995a7 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1086,7 +1086,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: %s%s. Correct stock or go back to choose another warehouse. WeightVolShort=Weight/Vol. ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments. diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 7d23700f983..aeb83b925bd 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -74,7 +74,7 @@ RealStock=Real Stock RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements. RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this): VirtualStock=Virtual stock -VirtualStockDesc=Virtual stock is the stock you will get once all opened pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...) +VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...) IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang index 61b031459b0..621d7784e35 100644 --- a/htdocs/langs/en_US/supplier_proposal.lang +++ b/htdocs/langs/en_US/supplier_proposal.lang @@ -8,7 +8,7 @@ SearchRequest=Find a request DraftRequests=Draft requests SupplierProposalsDraft=Draft supplier proposals LastModifiedRequests=Latest %s modified price requests -RequestsOpened=Opened price requests +RequestsOpened=Open price requests SupplierProposalArea=Supplier proposals area SupplierProposalShort=Supplier proposal SupplierProposals=Supplier proposals @@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na DeleteAsk=Delete request ValidateAsk=Validate request SupplierProposalStatusDraft=Draft (needs to be validated) -SupplierProposalStatusValidated=Validated (request is opened) +SupplierProposalStatusValidated=Validated (request is open) SupplierProposalStatusClosed=Closed SupplierProposalStatusSigned=Accepted SupplierProposalStatusNotSigned=Refused diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index aaa9254987b..24300718a3b 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2974,6 +2974,9 @@ tr.box_titre { tr.box_titre td.boxclose { width: 30px; } +img.boxhandle, img.boxclose { + padding-left: 5px; +} .noborderbottom { border-bottom: none !important; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 994a5be6924..dd0f07b0a95 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2889,6 +2889,9 @@ tr.box_titre { tr.box_titre td.boxclose { width: 30px; } +img.boxhandle, img.boxclose { + padding-left: 5px; +} .noborderbottom { border-bottom: none !important;