diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index a24f85cecad..18b67fb1e4c 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -989,9 +989,9 @@ if ($action == 'create')
{
print '
';
print '';
print $langs->trans('IncotermLabel');
- print ' ';
+ print ' ';
if ($user->rights->reception->creer) print ''.img_edit().' ';
else print ' ';
print '
';
@@ -1637,24 +1637,24 @@ elseif ($id || $ref)
// #
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{
- print ' ';
+ print ' ';
}
// Product/Service
print ''.$langs->trans("Products").' ';
// Comment
print ''.$langs->trans("Description").' ';
// Qty
- print ''.$langs->trans("QtyOrdered").' ';
+ print ''.$langs->trans("QtyOrdered").' ';
if ($origin && $origin_id > 0)
{
- print ''.$langs->trans("QtyInOtherReceptions").' ';
+ print ''.$langs->trans("QtyInOtherReceptions").' ';
}
if ($action == 'editline')
{
$editColspan = 3;
if (empty($conf->stock->enabled)) $editColspan--;
if (empty($conf->productbatch->enabled)) $editColspan--;
- print '';
+ print ' ';
if ($object->statut <= 1)
{
print $langs->trans("QtyToReceive").' - ';
@@ -1677,11 +1677,11 @@ elseif ($id || $ref)
{
if ($object->statut <= 1)
{
- print ' '.$langs->trans("QtyToReceive").' ';
+ print ''.$langs->trans("QtyToReceive").' ';
}
else
{
- print ''.$langs->trans("QtyReceived").' ';
+ print ''.$langs->trans("QtyReceived").' ';
}
if (! empty($conf->stock->enabled))
{
@@ -1693,9 +1693,9 @@ elseif ($id || $ref)
print ''.$langs->trans("Batch").' ';
}
}
- print ''.$langs->trans("CalculatedWeight").' ';
- print ''.$langs->trans("CalculatedVolume").' ';
- //print ''.$langs->trans("Size").' ';
+ print ''.$langs->trans("CalculatedWeight").' ';
+ print ''.$langs->trans("CalculatedVolume").' ';
+ //print ''.$langs->trans("Size").' ';
if ($object->statut == 0)
{
print ' ';
@@ -1775,7 +1775,7 @@ elseif ($id || $ref)
// #
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{
- print ''.($i+1).' ';
+ print ''.($i+1).' ';
}
// Predefined product or service
@@ -1834,12 +1834,12 @@ elseif ($id || $ref)
// Qty ordered
- print ''.$lines[$i]->qty_asked.' ';
+ print ''.$lines[$i]->qty_asked.' ';
// Qty in other receptions (with reception and warehouse used)
if ($origin && $origin_id > 0)
{
- print '';
+ print ' ';
foreach ($alreadysent as $key => $val)
{
if ($lines[$i]->fk_commandefourndet == $key)
@@ -1871,7 +1871,7 @@ elseif ($id || $ref)
if ($action == 'editline' && $lines[$i]->id == $line_id)
{
// edit mode
- print ' ';
+ print '';
if (! empty($conf->stock->enabled))
{
if ($lines[$i]->fk_product > 0)
@@ -1912,7 +1912,7 @@ elseif ($id || $ref)
else
{
// Qty to receive or received
- print ''.$lines[$i]->qty.' ';
+ print ''.$lines[$i]->qty.' ';
// Warehouse source
if (! empty($conf->stock->enabled))
@@ -1959,13 +1959,13 @@ elseif ($id || $ref)
}
// Weight
- print '';
+ print ' ';
if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->weight*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->weight_units, "weight");
else print ' ';
print ' ';
// Volume
- print '';
+ print ' ';
if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->volume*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->volume_units, "volume");
else print ' ';
print ' ';
@@ -1973,14 +1973,14 @@ elseif ($id || $ref)
if ($action == 'editline' && $lines[$i]->id == $line_id)
{
- print '';
+ print ' ';
print ' ';
print ' ';
}
elseif ($object->statut == 0)
{
// edit-delete buttons
- print ' ';
+ print ' ';
print 'id . '&action=editline&lineid=' . $lines[$i]->id . '">' . img_edit() . ' ';
print ' ';
print '';
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index 74cc86f26a5..3b0bb7a05e0 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -160,7 +160,7 @@ if ($resql)
print ' ';
print $companystatic->getNomUrl(1, 'customer', 32);
print ' ';
- print '';
+ print ' ';
print $orderstatic->getLibStatut(3);
print ' ';
print '';
@@ -219,7 +219,7 @@ if ( $resql )
print '';
print $companystatic->getNomUrl(1, 'customer');
print ' ';
- print '';
+ print ' ';
print $orderstatic->getLibStatut(3);
print ' ';
print '';
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 5cb3a100e71..3340a192081 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -647,7 +647,7 @@ if ($resql)
// Thirdparty
if (! empty($arrayfields['s.nom']['checked']))
{
- print '';
+ print ' ';
print ' ';
print ' ';
}
@@ -665,14 +665,14 @@ if ($resql)
// Country
if (! empty($arrayfields['country.code_iso']['checked']))
{
- print '';
+ print ' ';
print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth100');
print ' ';
}
// Company type
if (! empty($arrayfields['typent.code']['checked']))
{
- print '';
+ print ' ';
print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
print ' ';
}
@@ -735,19 +735,19 @@ if ($resql)
// Status
if (! empty($arrayfields['e.fk_statut']['checked']))
{
- print '';
+ print ' ';
print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusReceptionDraftShort'),'1'=>$langs->trans('StatusReceptionValidatedShort'),'2'=>$langs->trans('StatusReceptionProcessedShort')), $viewstatut, 1);
print ' ';
}
// Status billed
if (! empty($arrayfields['e.billed']['checked']))
{
- print '';
+ print ' ';
print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
print ' ';
}
// Action column
- print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -756,15 +756,15 @@ if ($resql)
print '';
if (! empty($arrayfields['e.ref']['checked'])) print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['e.ref_supplier']['checked'])) print_liste_field_titre($arrayfields['e.ref_supplier']['label'], $_SERVER["PHP_SELF"], "e.ref_supplier", "", $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, 'align="left"', $sortfield, $sortorder);
+ if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder, 'left ');
if (! empty($arrayfields['s.town']['checked'])) print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['s.zip']['checked'])) print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['e.date_delivery']['checked'])) print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, 'align="center"', $sortfield, $sortorder);
+ if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['e.date_delivery']['checked'])) print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['l.ref']['checked'])) print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['l.date_delivery']['checked'])) print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, 'align="center"', $sortfield, $sortorder);
+ if (! empty($arrayfields['l.date_delivery']['checked'])) print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
// Extra fields
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
{
@@ -775,7 +775,7 @@ if ($resql)
$align=$extrafields->getAlignFlag($key);
$sortonfield = "ef.".$key;
if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
- print_liste_field_titre($extralabels[$key], $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder);
+ print_liste_field_titre($extralabels[$key], $_SERVER["PHP_SELF"], $sortonfield, "", $param, '', $sortfield, $sortorder, ($align?'"'.$align.' "':''));
}
}
}
@@ -783,11 +783,11 @@ if ($resql)
$parameters=array('arrayfields'=>$arrayfields);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- if (! empty($arrayfields['e.datec']['checked'])) print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- if (! empty($arrayfields['e.tms']['checked'])) print_liste_field_titre($arrayfields['e.tms']['label'], $_SERVER["PHP_SELF"], "e.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'], $_SERVER["PHP_SELF"], "e.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+ if (! empty($arrayfields['e.datec']['checked'])) print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ if (! empty($arrayfields['e.tms']['checked'])) print_liste_field_titre($arrayfields['e.tms']['label'], $_SERVER["PHP_SELF"], "e.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'], $_SERVER["PHP_SELF"], "e.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print " \n";
$i=0;
@@ -862,7 +862,7 @@ if ($resql)
// Country
if (! empty($arrayfields['country.code_iso']['checked']))
{
- print '';
+ print ' ';
$tmparray=getCountry($obj->fk_pays, 'all');
print $tmparray['label'];
print ' ';
@@ -871,7 +871,7 @@ if ($resql)
// Type ent
if (! empty($arrayfields['typent.code']['checked']))
{
- print '';
+ print ' ';
if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
print $typenArray[$obj->typent_code];
print ' ';
@@ -881,7 +881,7 @@ if ($resql)
// Date delivery planed
if (! empty($arrayfields['e.date_delivery']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_livraison), "day");
/*$now = time();
if ( ($now - $db->jdate($obj->date_reception)) > $conf->warnings->lim && $obj->statutid == 1 )
@@ -907,7 +907,7 @@ if ($resql)
if (! empty($arrayfields['l.date_delivery']['checked']))
{
// Date received
- print ' ';
+ print ' ';
print dol_print_date($db->jdate($obj->date_reception), "day");
print ' '."\n";
}
@@ -920,10 +920,10 @@ if ($resql)
{
if (! empty($arrayfields["ef.".$key]['checked']))
{
- print '';
@@ -938,7 +938,7 @@ if ($resql)
// Date creation
if (! empty($arrayfields['e.datec']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -946,7 +946,7 @@ if ($resql)
// Date modification
if (! empty($arrayfields['e.tms']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_update), 'dayhour');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -954,18 +954,18 @@ if ($resql)
// Status
if (! empty($arrayfields['e.fk_statut']['checked']))
{
- print ''.$reception->LibStatut($obj->fk_statut, 5).' ';
+ print ''.$reception->LibStatut($obj->fk_statut, 5).' ';
if (! $i) $totalarray['nbfield']++;
}
// Billed
if (! empty($arrayfields['e.billed']['checked']))
{
- print ''.yn($obj->billed).' ';
+ print ''.yn($obj->billed).' ';
if (! $i) $totalarray['nbfield']++;
}
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index b4034588218..94e77c3c4b5 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -255,7 +255,7 @@ print '';
arsort($arrayyears);
print $form->selectarray('year', $arrayyears, $year, 0);
print '
';
- print ' ';
+ print ' ';
print '
';
print '';
print ' ';
@@ -263,10 +263,10 @@ print '';
print '
';
print '';
-print ''.$langs->trans("Year").' ';
-print ''.$langs->trans("NbOfReceptions").' ';
-/*print ''.$langs->trans("AmountTotal").' ';
-print ''.$langs->trans("AmountAverage").' ';*/
+print ''.$langs->trans("Year").' ';
+print ''.$langs->trans("NbOfReceptions").' ';
+/*print ''.$langs->trans("AmountTotal").' ';
+print ''.$langs->trans("AmountAverage").' ';*/
print ' ';
$oldyear=0;
@@ -279,22 +279,22 @@ foreach ($data as $val)
print '';
- print ''.$oldyear.' ';
+ print ''.$oldyear.' ';
- print '0 ';
- /*print '0 ';
- print '0 ';*/
+ print '0 ';
+ /*print '0 ';
+ print '0 ';*/
print ' ';
}
print '';
- print '';
+ print ' ';
if ($year) print ''.$year.' ';
else print $langs->trans("ValidationDateNotDefinedEvenIfReceptionValidated");
print ' ';
- print ''.$val['nb'].' ';
- /*print ''.price(price2num($val['total'],'MT'),1).' ';
- print ''.price(price2num($val['avg'],'MT'),1).' ';*/
+ print ''.$val['nb'].' ';
+ /*print ''.price(price2num($val['total'],'MT'),1).' ';
+ print ''.price(price2num($val['avg'],'MT'),1).' ';*/
print ' ';
$oldyear=$year;
}
@@ -306,7 +306,7 @@ print '';
// Show graphs
-print '
';
+print '';
if ($mesg) { print $mesg; }
else {
print $px1->show();
@@ -328,8 +328,8 @@ dol_fiche_end();
// TODO USe code similar to commande/stats/index.php instead of this one.
/*
print '';
-print ''.$langs->trans("Year").' ';
-print ''.$langs->trans("NbOfReceptions").' ';
+print ''.$langs->trans("Year").' ';
+print ''.$langs->trans("NbOfReceptions").' ';
$sql = "SELECT count(*) as nb, date_format(date_reception,'%Y') as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."reception";
@@ -348,7 +348,7 @@ if ($resql)
$nbproduct = $row[0];
$year = $row[1];
print "";
- print ''.$year.' '.$nbproduct.' ';
+ print ''.$year.' '.$nbproduct.' ';
$i++;
}
}
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index bd12cbd2902..9601c661c70 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php
@@ -41,14 +41,14 @@ foreach($linkedObjectBlock as $key => $objectlink)
trans("Reception"); ?>
getNomUrl(1); ?>
- date_delivery, 'day'); ?>
- date_delivery, 'day'); ?>
+ rights->reception->lire) {
$total = $total + $objectlink->total_ht;
echo price($objectlink->total_ht);
} ?>
- getLibStatut(3); ?>
-
+ getLibStatut(3); ?>
+
element != 'order_supplier') {
@@ -66,11 +66,11 @@ if (count($linkedObjectBlock) > 1)
trans("Total"); ?>
-
-
-
-
-
+
+
+
+
+
';
+print '';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
print "\n";
print '';
-if (! empty($arrayfields['t.ref']['checked'])) print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
-if (! empty($arrayfields['ty.label']['checked'])) print_liste_field_titre($arrayfields['ty.label']['label'], $_SERVER["PHP_SELF"], "ty.label", "", $param, "", $sortfield, $sortorder);
+if (! empty($arrayfields['t.ref']['checked'])) print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
+if (! empty($arrayfields['ty.label']['checked'])) print_liste_field_titre($arrayfields['ty.label']['label'], $_SERVER["PHP_SELF"], "ty.label", "", $param, "", $sortfield, $sortorder);
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print " \n";
@@ -266,7 +266,7 @@ if ($ret)
$obj = (Object) $resource->array_options;
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
- print '';
+ print ' ';
print '';
print img_edit();
print ' ';