Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/langs/en_US/main.lang

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();

htdocs/index.php

@@ -530,26 +530,23 @@ $boxwork.='<div class="box">';
 $boxwork.='<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable" width="100%">'."\n";
 $boxwork.='<tr class="liste_titre">';
 $boxwork.='<th class="liste_titre">'.$langs->trans("DolibarrWorkBoard").'</th>';
-//$boxwork.='<th class="liste_titre" align="right">'.$langs->trans("Number").'</th>';
-//$boxwork.='<th class="liste_titre" align="right">'.$form->textwithpicto($langs->trans("Late"),$langs->trans("LateDesc")).'</th>';
-//$boxwork.='<th class="liste_titre" style="width: 22px">&nbsp;</th>';
-//print '<th class="liste_titre" width="20">&nbsp;</th>';
-//if ($showweather) $boxwork.='<th class="liste_titre hideonsmartphone" width="80">&nbsp;</th>';
 $boxwork.='</tr>'."\n";
 
 if ($showweather)
-{/*
+{
     $boxwork.='<tr class="nohover">';
     $boxwork.='<td class="nohover hideonsmartphone center valignmiddle">';
     $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.='</td>';
-    $boxwork.='</tr>';*/
+    $boxwork.='</tr>';
 }
 
-$boxwork.='<td class="tdboxstats nohover flexcontainer">';
+$boxwork.='<tr class="nohover"><td class="tdboxstats nohover flexcontainer">';
 
 // Show dashboard
 $nbworkboardempty=0;

htdocs/langs/en_US/admin.lang

@@ -1086,7 +1086,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.

htdocs/langs/en_US/agenda.lang

@@ -52,8 +52,8 @@ MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
 MemberSubscriptionAddedInDolibarr=Subscription for member %s added
 ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentClassifyClosedInDolibarr=Shipment %s classify billed
+ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classify reopened
+ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened
 ShipmentDeletedInDolibarr=Shipment %s deleted
 OrderCreatedInDolibarr=Order %s created
 OrderValidatedInDolibarr=Order %s validated

htdocs/langs/en_US/banks.lang

@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 LineRecord=Transaction

htdocs/langs/en_US/companies.lang

@@ -389,7 +389,7 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Opened
+InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s

htdocs/langs/en_US/main.lang

@@ -171,7 +171,7 @@ SearchOf=Search
 Valid=Valid
 Approve=Approve
 Disapprove=Disapprove
-ReOpen=Re-Open
+ReOpen=Re-Opened
 Upload=Send file
 ToLink=Link
 Select=Select
@@ -406,8 +406,8 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
+DolibarrStateBoard=Database statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrWorkBoard=Open items dashboard 
 NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
@@ -436,7 +436,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown

htdocs/langs/en_US/projects.lang

@@ -33,9 +33,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
+OpenedProjects=Open projects
-OpenedTasks=Opened tasks
+OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -51,7 +51,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -183,9 +183,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount

htdocs/langs/en_US/propal.lang

@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Opened commercial proposals
+ProposalsOpened=Open commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Opened
+PropalsOpened=Open
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=Validated (proposal is open)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed

htdocs/langs/en_US/sendings.lang

@@ -51,10 +51,10 @@ ActionsOnShipping=Events on shipment
 LinkToTrackYourPackage=Link to track your package
 ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
 ShipmentLine=Shipment line
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
+ProductQtyInCustomersOrdersRunning=Product quantity into open customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
+ProductQtyInSuppliersOrdersRunning=Product quantity into open suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from oped customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. 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.

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

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

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;

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;