diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php
index 50d64521621..48adfa2b2b3 100644
--- a/htdocs/stripe/payment.php
+++ b/htdocs/stripe/payment.php
@@ -80,7 +80,7 @@ if ($facid > 0)
if (! empty($conf->stripe->enabled))
{
- access_forbidden();
+ access_forbidden();
}
if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))
diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index 99a00668926..b3b0e482f62 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -84,9 +84,9 @@ print '';
print ''.$langs->trans("Label").' ';
print ''.$langs->trans("AttributeCode").' ';
print ''.$langs->trans("Type").' ';
-print ''.$langs->trans("Size").' ';
-print ''.$langs->trans("Unique").' ';
-print ''.$langs->trans("Required").' ';
+print ''.$langs->trans("Size").' ';
+print ''.$langs->trans("Unique").' ';
+print ''.$langs->trans("Required").' ';
print ' ';
print " \n";
@@ -96,10 +96,10 @@ foreach($extrafields->attribute_type as $key => $value)
print "".$extrafields->attribute_label[$key]." \n";
print "".$key." \n";
print "".$type2label[$extrafields->attribute_type[$key]]." \n";
- print ''.$extrafields->attribute_size[$key]." \n";
- print ''.yn($extrafields->attribute_unique[$key])." \n";
- print ''.yn($extrafields->attribute_required[$key])." \n";
- print ''.img_edit().' ';
+ print ''.$extrafields->attribute_size[$key]." \n";
+ print ''.yn($extrafields->attribute_unique[$key])." \n";
+ print ''.yn($extrafields->attribute_required[$key])." \n";
+ print ''.img_edit().' ';
print " ".img_delete()." id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . ' id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . ' ';
if ($action == 'editconditions') {
@@ -1486,7 +1486,7 @@ if ($action == 'create')
print $langs->trans('DeliveryDate');
print ' ';
if ($action != 'editdate_livraison' && ! empty($object->brouillon))
- print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1) . ' id . '">' . img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1) . ' ';
if ($action == 'editdate_livraison') {
@@ -1509,7 +1509,7 @@ if ($action == 'create')
print $langs->trans('PaymentMode');
print ' ';
if ($action != 'editmode' && ! empty($object->brouillon))
- print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . ' id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . ' ';
if ($action == 'editmode') {
@@ -1529,7 +1529,7 @@ if ($action == 'create')
print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
print ' ';
if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
- print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ' id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ' ';
if ($action == 'editmulticurrencycode') {
@@ -1546,7 +1546,7 @@ if ($action == 'create')
print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
print ' ';
if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
- print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ' id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ' ';
if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
@@ -1571,7 +1571,7 @@ if ($action == 'create')
// Outstanding Bill
print ' ';
print $langs->trans('OutstandingBill');
- print ' ';
+ print ' ';
print price($soc->get_OutstandingBill()) . ' / ';
print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
print ' ';
@@ -1586,7 +1586,7 @@ if ($action == 'create')
print $langs->trans('BankAccount');
print '';
if ($action != 'editbankaccount' && $user->rights->supplier_proposal->creer)
- print 'id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' ';
if ($action == 'editbankaccount') {
@@ -1739,7 +1739,7 @@ if ($action == 'create')
if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) $form_close .= ''.$langs->trans('SupplierProposalRefFournNotice').'
'; // TODO Suggest a permanent checkbox instead of option
$form_close .= ' ';
- print '';
+ print ' ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
@@ -272,7 +272,7 @@ if ($resql)
print ' '.$companystatic->getNomUrl(1, 'customer').' ';
print ''.dol_print_date($db->jdate($obj->datec), 'day').' ';
- print ''.$supplier_proposalstatic->LibStatut($obj->fk_statut, 5).' ';
+ print ''.$supplier_proposalstatic->LibStatut($obj->fk_statut, 5).' ';
print '';
$i++;
}
@@ -333,7 +333,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
print '';
if ($db->jdate($obj->dfv) < ($now - $conf->supplier_proposal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
print ' ';
- print '';
+ print ' ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->supplier_proposalid;
@@ -348,10 +348,10 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
$companystatic->canvas=$obj->canvas;
print ' '.$companystatic->getNomUrl(1, 'customer', 44).' '."\n";
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->dp), 'day').' '."\n";
- print ''.price($obj->total_ttc).' ';
- print ''.$supplier_proposalstatic->LibStatut($obj->fk_statut, 3).' '."\n";
+ print ''.price($obj->total_ttc).' ';
+ print ''.$supplier_proposalstatic->LibStatut($obj->fk_statut, 3).' '."\n";
print ''."\n";
$i++;
$total += $obj->total_ttc;
@@ -362,7 +362,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
}
elseif ($total>0)
{
- print ''.$langs->trans("Total")." ".price($total)." '.$langs->trans("Total").' '.price($total)." ';
+ print ' ';
print ' ';
}
@@ -492,21 +492,21 @@ 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 ' ';
}
// Date
if (! empty($arrayfields['sp.date_valid']['checked']))
{
- print '';
+ print ' ';
//print $langs->trans('Month').': ';
print ' ';
+ print ' ';
//print $langs->trans('Month').': ';
print ' ';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['sp.total_vat']['checked']))
{
// Amount
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['sp.total_ttc']['checked']))
{
// Amount
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['u.login']['checked']))
{
// Author
- print '';
+ print ' ';
print ' ';
}
@@ -575,12 +575,12 @@ if ($resql)
// Status
if (! empty($arrayfields['sp.fk_statut']['checked']))
{
- print '';
+ print ' ';
$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status');
print ' ';
}
// Action column
- print '';
+ print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -594,24 +594,24 @@ if ($resql)
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['sp.date_valid']['checked'])) print_liste_field_titre($arrayfields['sp.date_valid']['label'], $_SERVER["PHP_SELF"], 'sp.date_valid', '', $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.date_livraison']['checked'])) print_liste_field_titre($arrayfields['sp.date_livraison']['label'], $_SERVER["PHP_SELF"], 'sp.date_livraison', '', $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.total_ht']['checked'])) print_liste_field_titre($arrayfields['sp.total_ht']['label'], $_SERVER["PHP_SELF"], 'sp.total_ht', '', $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.total_vat']['checked'])) print_liste_field_titre($arrayfields['sp.total_vat']['label'], $_SERVER["PHP_SELF"], 'sp.total_vat', '', $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.total_ttc']['checked'])) print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $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['sp.date_valid']['checked'])) print_liste_field_titre($arrayfields['sp.date_valid']['label'], $_SERVER["PHP_SELF"], 'sp.date_valid', '', $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['sp.date_livraison']['checked'])) print_liste_field_titre($arrayfields['sp.date_livraison']['label'], $_SERVER["PHP_SELF"], 'sp.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['sp.total_ht']['checked'])) print_liste_field_titre($arrayfields['sp.total_ht']['label'], $_SERVER["PHP_SELF"], 'sp.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['sp.total_vat']['checked'])) print_liste_field_titre($arrayfields['sp.total_vat']['label'], $_SERVER["PHP_SELF"], 'sp.total_vat', '', $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['sp.total_ttc']['checked'])) print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ';
+ if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder, 'center ');
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- if (! empty($arrayfields['sp.datec']['checked'])) print_liste_field_titre($arrayfields['sp.datec']['label'], $_SERVER["PHP_SELF"], "sp.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.tms']['checked'])) print_liste_field_titre($arrayfields['sp.tms']['label'], $_SERVER["PHP_SELF"], "sp.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.fk_statut']['checked'])) print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+ if (! empty($arrayfields['sp.datec']['checked'])) print_liste_field_titre($arrayfields['sp.datec']['label'], $_SERVER["PHP_SELF"], "sp.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ if (! empty($arrayfields['sp.tms']['checked'])) print_liste_field_titre($arrayfields['sp.tms']['label'], $_SERVER["PHP_SELF"], "sp.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap');
+ if (! empty($arrayfields['sp.fk_statut']['checked'])) print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print ''."\n";
$now = dol_now();
@@ -654,7 +654,7 @@ if ($resql)
print '';
}
// Other picto tool
- print '';
+ print ' ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
@@ -707,7 +707,7 @@ if ($resql)
// Country
if (! empty($arrayfields['country.code_iso']['checked']))
{
- print ' ';
+ print ' ';
$tmparray=getCountry($obj->fk_pays, 'all');
print $tmparray['label'];
print ' ';
@@ -716,7 +716,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 ' ';
@@ -726,7 +726,7 @@ if ($resql)
// Date proposal
if (! empty($arrayfields['sp.date_valid']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_valid), 'day');
print " \n";
if (! $i) $totalarray['nbfield']++;
@@ -735,7 +735,7 @@ if ($resql)
// Date delivery
if (! empty($arrayfields['sp.date_livraison']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->dp), 'day');
print " \n";
if (! $i) $totalarray['nbfield']++;
@@ -744,7 +744,7 @@ if ($resql)
// Amount HT
if (! empty($arrayfields['sp.total_ht']['checked']))
{
- print ''.price($obj->total_ht)." \n";
+ print ''.price($obj->total_ht)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
$totalarray['totalht'] += $obj->total_ht;
@@ -752,7 +752,7 @@ if ($resql)
// Amount VAT
if (! empty($arrayfields['sp.total_vat']['checked']))
{
- print ''.price($obj->total_vat)." \n";
+ print ''.price($obj->total_vat)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
$totalarray['totalvat'] += $obj->total_vat;
@@ -760,7 +760,7 @@ if ($resql)
// Amount TTC
if (! empty($arrayfields['sp.total_ttc']['checked']))
{
- print ''.price($obj->total_ttc)." \n";
+ print ''.price($obj->total_ttc)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
$totalarray['totalttc'] += $obj->total_ttc;
@@ -772,7 +772,7 @@ if ($resql)
// Author
if (! empty($arrayfields['u.login']['checked']))
{
- print '';
+ print ' ';
if ($userstatic->id) print $userstatic->getLoginUrl(1);
else print ' ';
print " \n";
@@ -788,7 +788,7 @@ if ($resql)
// Date creation
if (! empty($arrayfields['sp.datec']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -796,7 +796,7 @@ if ($resql)
// Date modification
if (! empty($arrayfields['sp.tms']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -804,12 +804,12 @@ if ($resql)
// Status
if (! empty($arrayfields['sp.fk_statut']['checked']))
{
- print ''.$objectstatic->LibStatut($obj->fk_statut, 5)." \n";
+ print ''.$objectstatic->LibStatut($obj->fk_statut, 5)." \n";
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;
@@ -845,9 +845,9 @@ if ($resql)
if ($num < $limit && empty($offset)) print ' '.$langs->trans("Total").' ';
else print ''.$langs->trans("Totalforthispage").' ';
}
- elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
- elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
- elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).' ';
+ elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
+ elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
+ elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).' ';
else print 'trans("SupplierProposal"); ?>
trans("ShowSupplierProposal"), "supplier_proposal").' '.$objectlink->ref; ?> datec, 'day'); ?>
- datec, 'day'); ?>
+ rights->supplier_proposal->lire) {
$total = $total + $objectlink->total_ht;
echo price($objectlink->total_ht);
} ?>
- getLibStatut(3); ?>
- ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?> getLibStatut(3); ?>
+ ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
trans("Total"); ?>