';
$i=0;
foreach($dirskins as $dir)
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 162bee68128..9592cd7fb16 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -324,10 +324,10 @@ function show_stats_for_company($product, $socid)
$nblines = 0;
print ' ';
- print '| '.$langs->trans("Referers").' | ';
- print ''.$langs->trans("NbOfThirdParties").' | ';
- print ''.$langs->trans("NbOfObjectReferers").' | ';
- print ''.$langs->trans("TotalQuantity").' | ';
+ print ''.$langs->trans("Referers").' | ';
+ print ''.$langs->trans("NbOfThirdParties").' | ';
+ print ''.$langs->trans("NbOfObjectReferers").' | ';
+ print ''.$langs->trans("TotalQuantity").' | ';
print ' ';
// Customer proposals
@@ -339,11 +339,11 @@ function show_stats_for_company($product, $socid)
$langs->load("propal");
print ' | ';
print ''.img_object('', 'propal').' '.$langs->trans("Proposals").'';
- print ' | ';
+ print ' | ';
print $product->stats_propale['customers'];
- print ' | ';
+ print ' | ';
print $product->stats_propale['nb'];
- print ' | ';
+ print ' | ';
print $product->stats_propale['qty'];
print ' | ';
print ' ';
@@ -357,11 +357,11 @@ function show_stats_for_company($product, $socid)
$langs->load("propal");
print ' | ';
print ''.img_object('', 'propal').' '.$langs->trans("SupplierProposals").'';
- print ' | ';
+ print ' | ';
print $product->stats_proposal_supplier['suppliers'];
- print ' | ';
+ print ' | ';
print $product->stats_proposal_supplier['nb'];
- print ' | ';
+ print ' | ';
print $product->stats_proposal_supplier['qty'];
print ' | ';
print ' ';
@@ -375,11 +375,11 @@ function show_stats_for_company($product, $socid)
$langs->load("orders");
print ' | ';
print ''.img_object('', 'order').' '.$langs->trans("CustomersOrders").'';
- print ' | ';
+ print ' | ';
print $product->stats_commande['customers'];
- print ' | ';
+ print ' | ';
print $product->stats_commande['nb'];
- print ' | ';
+ print ' | ';
print $product->stats_commande['qty'];
print ' | ';
print ' ';
@@ -393,11 +393,11 @@ function show_stats_for_company($product, $socid)
$langs->load("orders");
print ' | ';
print ''.img_object('', 'order').' '.$langs->trans("SuppliersOrders").'';
- print ' | ';
+ print ' | ';
print $product->stats_commande_fournisseur['suppliers'];
- print ' | ';
+ print ' | ';
print $product->stats_commande_fournisseur['nb'];
- print ' | ';
+ print ' | ';
print $product->stats_commande_fournisseur['qty'];
print ' | ';
print ' ';
@@ -411,11 +411,11 @@ function show_stats_for_company($product, $socid)
$langs->load("bills");
print ' | ';
print ''.img_object('', 'bill').' '.$langs->trans("CustomersInvoices").'';
- print ' | ';
+ print ' | ';
print $product->stats_facture['customers'];
- print ' | ';
+ print ' | ';
print $product->stats_facture['nb'];
- print ' | ';
+ print ' | ';
print $product->stats_facture['qty'];
print ' | ';
print ' ';
@@ -429,11 +429,11 @@ function show_stats_for_company($product, $socid)
$langs->load("bills");
print ' | ';
print ''.img_object('', 'bill').' '.$langs->trans("SuppliersInvoices").'';
- print ' | ';
+ print ' | ';
print $product->stats_facture_fournisseur['suppliers'];
- print ' | ';
+ print ' | ';
print $product->stats_facture_fournisseur['nb'];
- print ' | ';
+ print ' | ';
print $product->stats_facture_fournisseur['qty'];
print ' | ';
print ' ';
@@ -448,11 +448,11 @@ function show_stats_for_company($product, $socid)
$langs->load("contracts");
print ' | ';
print ''.img_object('', 'contract').' '.$langs->trans("Contracts").'';
- print ' | ';
+ print ' | ';
print $product->stats_contrat['customers'];
- print ' | ';
+ print ' | ';
print $product->stats_contrat['nb'];
- print ' | ';
+ print ' | ';
print $product->stats_contrat['qty'];
print ' | ';
print ' ';
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 83072279268..92df28d9922 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -489,12 +489,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print " | \n";
// Date start
- print '';
+ print ' | ';
print dol_print_date($lines[$i]->date_start, 'dayhour');
print ' | ';
// Date end
- print '';
+ print ' | ';
$taskstatic->projectstatus = $lines[$i]->projectstatus;
$taskstatic->progress = $lines[$i]->progress;
$taskstatic->fk_statut = $lines[$i]->status;
@@ -509,7 +509,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
// Planned Workload (in working hours)
- print ' | ';
+ print ' | ';
$fullhour=convertSecondToTime($lines[$i]->planned_workload, $plannedworkloadoutputformat);
$workingdelay=convertSecondToTime($lines[$i]->planned_workload, 'all', 86400, 7); // TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
if ($lines[$i]->planned_workload != '')
@@ -522,7 +522,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print ' | ';
// Time spent
- print '';
+ print ' | ';
if ($showlineingray) print '';
else print '';
if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration, $timespentoutputformat);
@@ -532,7 +532,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print ' | ';
// Progress calculated (Note: ->duration is time spent)
- print '';
+ print ' | ';
if ($lines[$i]->planned_workload || $lines[$i]->duration)
{
if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload, 2).' %';
@@ -541,7 +541,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print ' | ';
// Progress declared
- print '';
+ print ' | ';
if ($lines[$i]->progress != '')
{
print $lines[$i]->progress.' %';
@@ -572,7 +572,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
// Tick to drag and drop
if ($addordertick)
{
- print ' | | ';
+ print ' | ';
}
print "
\n";
@@ -605,15 +605,15 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print ' | ';
print ' | ';
print ' | ';
- print '';
+ print ' | ';
print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
print ' | ';
- print '';
+ print ' | ';
if ($projectidfortotallink > 0) print '';
print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
if ($projectidfortotallink > 0) print '';
print ' | ';
- print '';
+ print ' | ';
if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2).' %';
print ' | ';
print ' | ';
@@ -773,7 +773,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
print "\n";
// Date
- print '';
+ print ' | ';
print dol_print_date($lines[$i]->timespent_datehour, 'day');
print ' | ';
@@ -794,7 +794,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
}
// Hour
- print '';
+ print ' | ';
print dol_print_date($lines[$i]->timespent_datehour, 'hour');
print ' | ';
@@ -804,7 +804,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
// Duration
- print '';
+ print ' | ';
$dayWorkLoad = $lines[$i]->timespent_duration;
$totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
@@ -825,14 +825,14 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
print ' | ';
// Note
- print '';
+ print ' | ';
print '';
print ' | ';
// Warning
- print '';
+ print ' | ';
/*if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
else if ($disabledtask)
{
@@ -1001,18 +1001,18 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
print " | \n";
// Planned Workload
- print '';
+ print ' | ';
if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
else print '--:--';
print ' | ';
// Progress declared %
- print '';
+ print ' | ';
print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
print ' | ';
// Time spent by everybody
- print '';
+ print ' | ';
// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
if ($lines[$i]->duration)
{
@@ -1024,7 +1024,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
print " | \n";
// Time spent by user
- print '';
+ print ' | ';
$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
else print '--:--';
@@ -1047,7 +1047,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
}
// Form to add new time
- print ' | ';
+ print ' | ';
$tableCell = $form->selectDate($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, $disabledtask);
print $tableCell;
print ' | ';
@@ -1097,13 +1097,13 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
print '';
// Note
- print '';
+ print ' | ';
print '';
print ' | ';
// Warning
- print '';
+ print ' | ';
if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
elseif ($disabledtask)
{
@@ -1291,18 +1291,18 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
print " | \n";
// Planned Workload
- print '';
+ print ' | ';
if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
else print '--:--';
print ' | ';
// Progress declared %
- print '';
+ print ' | ';
print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
print ' | ';
// Time spent by everybody
- print '';
+ print ' | ';
// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
if ($lines[$i]->duration)
{
@@ -1314,7 +1314,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
print " | \n";
// Time spent by user
- print '';
+ print ' | ';
$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
else print '--:--';
@@ -1381,7 +1381,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
}
// Warning
- print ' | ';
+ print ' | ';
if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
elseif ($disabledtask)
{
@@ -1629,36 +1629,36 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
print ' | ';
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
- print '';
+ print ' | ';
if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
print ' | ';
- print '';
+ print ' | ';
$code = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
if ($code) print $langs->trans("OppStatus".$code);
print ' | ';
}
if (empty($conf->global->PROJECT_HIDE_TASKS))
{
- print ''.$objp->nb.' | ';
+ print ''.$objp->nb.' | ';
$plannedworkload=$objp->planned_workload;
$total_plannedworkload+=$plannedworkload;
if (! in_array('plannedworkload', $hiddenfields))
{
- print ''.($plannedworkload?convertSecondToTime($plannedworkload):'').' | ';
+ print ''.($plannedworkload?convertSecondToTime($plannedworkload):'').' | ';
}
if (! in_array('declaredprogress', $hiddenfields))
{
$declaredprogressworkload=$objp->declared_progess_workload;
$total_declaredprogressworkload+=$declaredprogressworkload;
- print '';
+ print ' | ';
//print $objp->planned_workload.'-'.$objp->declared_progess_workload."
";
print ($plannedworkload?round(100*$declaredprogressworkload/$plannedworkload, 0).'%':'');
print ' | ';
}
}
- print ''.$projectstatic->getLibStatut(3).' | ';
+ print ''.$projectstatic->getLibStatut(3).' | ';
print "\n";
$total_task = $total_task + $objp->nb;
@@ -1673,14 +1673,14 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
print ''.$langs->trans("Total")." | ";
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
- print ''.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).' | ';
- print ''.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).' | ';
+ print ''.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).' | ';
+ print ''.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).' | ';
}
if (empty($conf->global->PROJECT_HIDE_TASKS))
{
- print ''.$total_task.' | ';
- if (! in_array('plannedworkload', $hiddenfields)) print ''.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').' | ';
- if (! in_array('declaredprogress', $hiddenfields)) print ''.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload, 0).'%':'').' | ';
+ print ''.$total_task.' | ';
+ if (! in_array('plannedworkload', $hiddenfields)) print ''.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').' | ';
+ if (! in_array('declaredprogress', $hiddenfields)) print ''.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload, 0).'%':'').' | ';
}
print ' | ';
print '';
@@ -1702,7 +1702,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
print '';
}
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index cc7d2c95115..97d8a318e5c 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -220,9 +220,9 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
//print ''.$langs->trans("QtyOrdered").' | ';
print ''.$langs->trans("SendingSheet").' | ';
print ''.$langs->trans("Description").' | ';
- print ''.$langs->trans("DateCreation").' | ';
- print ''.$langs->trans("DateDeliveryPlanned").' | ';
- print ''.$langs->trans("QtyPreparedOrShipped").' | ';
+ print ''.$langs->trans("DateCreation").' | ';
+ print ''.$langs->trans("DateDeliveryPlanned").' | ';
+ print ''.$langs->trans("QtyPreparedOrShipped").' | ';
if (! empty($conf->stock->enabled))
{
print ''.$langs->trans("Warehouse").' | ';
@@ -236,8 +236,8 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
if (! empty($conf->livraison_bon->enabled))
{
print ''.$langs->trans("DeliveryOrder").' | ';
- //print ''.$langs->trans("QtyReceived").' | ';
- print ''.$langs->trans("DeliveryDate").' | ';
+ //print ''.$langs->trans("QtyReceived").' | ';
+ print ''.$langs->trans("DeliveryDate").' | ';
}
print "\n";
@@ -248,7 +248,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
print '';
// Sending id
- print '| ';
+ print ' | ';
print ''.img_object($langs->trans("ShowSending"), 'sending').' '.$objp->exp_ref.'';
print ' | ';
@@ -324,16 +324,16 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
print "\n";
}
- //print ''.$objp->qty_asked.' | ';
+ //print ''.$objp->qty_asked.' | ';
// Date creation
- print ''.dol_print_date($db->jdate($objp->date_creation), 'day').' | ';
+ print ''.dol_print_date($db->jdate($objp->date_creation), 'day').' | ';
// Date shipping creation
- print ''.dol_print_date($db->jdate($objp->date_delivery), 'day').' | ';
+ print ''.dol_print_date($db->jdate($objp->date_delivery), 'day').' | ';
// Qty shipped
- print ''.$objp->qty_shipped.' | ';
+ print ''.$objp->qty_shipped.' | ';
// Warehouse
if (! empty($conf->stock->enabled))
@@ -403,13 +403,13 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
//print ''.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.'';
print '';
// Qty received
- //print '';
+ //print ' | ';
// TODO No solution for the moment to link a line det of receipt with a line det of shipping,
// so no way to know the qty received for this line of shipping.
//print $langs->trans("FeatureNotYetAvailable");
//print ' | ';
// Date shipping real
- print '';
+ print ' | ';
print dol_print_date($receiving->date_delivery, 'day');
print ' | ';
}
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index eacf0386eb5..34683e5b29f 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -171,7 +171,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
print ' ';
print $tab[$x]['title'];
print ' (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
- print '';
+ print ' | ';
print $tab[$x]['buttons'];
print ' |
';
}
@@ -207,7 +207,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
print $tab[$x]['title'];
print '';
print ' (mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' - fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
- print '