diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 84c1f5954b9..ac23177652f 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -602,7 +602,7 @@ if ($object->fetch($id) >= 0) } // Search Icon - print ''; + print ''; if ($obj->statut == 0) // Not sent yet { if ($user->rights->mailing->creer && $allowaddtarget) { diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index cb062e00777..0c98800b3ea 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -118,7 +118,7 @@ if (is_resource($handle)) while ($i < $num ) { $obj = $db->fetch_object($result); - print ''.img_object('',$mailmodule->picto).' '.$obj->label.''.$obj->nb.''; + print ''.img_object('',$mailmodule->picto).' '.$obj->label.''.$obj->nb.''; $i++; } @@ -161,7 +161,7 @@ if ($result) print ''.$langs->trans("LastMailings",$limit).''; print ''.$langs->trans("DateCreation").''; print ''.$langs->trans("NbOfEMails").''; - print ''.$langs->trans("AllEMailings").''; + print ''.$langs->trans("AllEMailings").''; $num = $db->num_rows($result); if ($num > 0) @@ -178,7 +178,7 @@ if ($result) print ''.dol_print_date($db->jdate($obj->date_creat),'day').''; print ''.($obj->nbemail?$obj->nbemail:"0").''; $mailstatic=new Mailing($db); - print ''.$mailstatic->LibStatut($obj->statut,5).''; + print ''.$mailstatic->LibStatut($obj->statut,5).''; print ''; $i++; } diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 9605f413435..c6ba6781423 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2046,7 +2046,7 @@ if ($action == 'create') print $langs->trans('Date'); print ''; if ($action != 'editdate' && ! empty($object->brouillon) && $usercancreate) - print 'id . '">' . img_edit($langs->trans('SetDate'), 1) . ''; + print 'id . '">' . img_edit($langs->trans('SetDate'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && $action == 'editdate' && $usercancreate) { @@ -2072,7 +2072,7 @@ if ($action == 'create') print $langs->trans('DateEndPropal'); print ''; if ($action != 'editecheance' && ! empty($object->brouillon) && $usercancreate) - print 'id . '">' . img_edit($langs->trans('SetConditions'), 1) . ''; + print 'id . '">' . img_edit($langs->trans('SetConditions'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && $action == 'editecheance' && $usercancreate) { @@ -2100,7 +2100,7 @@ if ($action == 'create') print $langs->trans('PaymentConditionsShort'); print ''; if ($action != 'editconditions' && ! empty($object->brouillon) && $usercancreate) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && $action == 'editconditions' && $usercancreate) { @@ -2128,7 +2128,7 @@ if ($action == 'create') print ' (' . $langs->trans('AfterOrder') . ')'; print ''; if ($action != 'editavailability' && ! empty($object->brouillon) && $usercancreate) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && $action == 'editavailability' && $usercancreate) { @@ -2147,7 +2147,7 @@ if ($action == 'create') print $langs->trans('SendingMethod'); print ''; if ($action != 'editshippingmethod' && $usercancreate) - print 'id.'">'.img_edit($langs->trans('SetShippingMode'),1).''; + print 'id.'">'.img_edit($langs->trans('SetShippingMode'),1).''; print ''; print ''; if ($action == 'editshippingmethod' && $usercancreate) { @@ -2165,7 +2165,7 @@ if ($action == 'create') print $langs->trans('Source'); print ''; if ($action != 'editdemandreason' && ! empty($object->brouillon) && $usercancreate) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && $action == 'editdemandreason' && $usercancreate) { @@ -2183,7 +2183,7 @@ if ($action == 'create') print $langs->trans('PaymentMode'); print ''; if ($action != 'editmode' && ! empty($object->brouillon) && $usercancreate) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && $action == 'editmode' && $usercancreate) { @@ -2203,7 +2203,7 @@ if ($action == 'create') print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0); print ''; if ($action != 'editmulticurrencycode' && ! empty($object->brouillon) && $usercancreate) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && $action == 'editmulticurrencycode' && $usercancreate) { @@ -2220,7 +2220,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 && $usercancreate) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') && $usercancreate) { @@ -2244,7 +2244,7 @@ if ($action == 'create') // Outstanding Bill print ''; print $langs->trans('OutstandingBill'); - print ''; + print ''; print price($soc->get_OutstandingBill()) . ' / '; print price($soc->outstanding_limit, 0, $langs, 1, - 1, - 1, $conf->currency); print ''; @@ -2259,7 +2259,7 @@ if ($action == 'create') print $langs->trans('BankAccount'); print ''; if ($action != 'editbankaccount' && $usercancreate) - print 'id.'">'.img_edit($langs->trans('SetBankAccount'),1).''; + print 'id.'">'.img_edit($langs->trans('SetBankAccount'),1).''; print ''; print ''; if ($action == 'editbankaccount') { @@ -2293,7 +2293,7 @@ if ($action == 'create') print ''; print '
'; print $langs->trans('IncotermLabel'); - print ''; + print ''; if ($usercancreate) print ''.img_edit().''; else print ' '; print '
'; @@ -2370,7 +2370,7 @@ if ($action == 'create') print ''; // Statut - //print '' . $langs->trans('Status') . '' . $object->getLibStatut(4) . ''; + //print '' . $langs->trans('Status') . '' . $object->getLibStatut(4) . ''; print ''; diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index f39f9efc54a..b96a95d8e64 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -123,7 +123,7 @@ if ($resql) print ''; print ''.$propalstatic->LibStatut($status,0).''; - print ''.(isset($vals[$status])?$vals[$status]:0).''; + print ''.(isset($vals[$status])?$vals[$status]:0).''; print "\n"; } } @@ -144,8 +144,8 @@ if ($resql) print ''; } //if ($totalinprocess != $total) - //print ''.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')'.$totalinprocess.''; - print ''.$langs->trans("Total").''.$total.''; + //print ''.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')'.$totalinprocess.''; + print ''.$langs->trans("Total").''.$total.''; print "
"; } else @@ -260,7 +260,7 @@ if ($resql) print ' '; print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -276,7 +276,7 @@ if ($resql) print ''.$companystatic->getNomUrl(1,'customer').''; print ''.dol_print_date($db->jdate($obj->datec),'day').''; - print ''.$propalstatic->LibStatut($obj->fk_statut,5).''; + print ''.$propalstatic->LibStatut($obj->fk_statut,5).''; print ''; $i++; } @@ -355,9 +355,9 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) $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 ''.price($obj->total_ttc).''; print ''.$propalstatic->LibStatut($obj->fk_statut,3).''."\n"; print ''."\n"; $i++; @@ -441,7 +441,7 @@ if (! empty($conf->propal->enabled)) print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).''; - print ''.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).''; + print ''.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).''; print ''; $i++; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 2d3917a0d47..61fa1d548d7 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -890,7 +890,7 @@ if ($resql) // Amount HT if (! empty($arrayfields['p.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; @@ -898,7 +898,7 @@ if ($resql) // Amount VAT if (! empty($arrayfields['p.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; @@ -906,7 +906,7 @@ if ($resql) // Amount TTC if (! empty($arrayfields['p.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; @@ -995,7 +995,7 @@ if ($resql) // Status if (! empty($arrayfields['p.fk_statut']['checked'])) { - print ''.$objectstatic->LibStatut($obj->fk_statut,5).''; + print ''.$objectstatic->LibStatut($obj->fk_statut,5).''; if (! $i) $totalarray['nbfield']++; } // Action column @@ -1033,14 +1033,14 @@ 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']).''; elseif ($totalarray['totalizable']) { $printed = false; foreach ($totalarray['totalizable'] as $totalizable) { if ($totalizable['pos']==$i && ! $printed) { - print ''.price($totalizable['total']).''; + print ''.price($totalizable['total']).''; $printed = true; } } diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 5c54baf7360..29afd62d780 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -280,12 +280,12 @@ print '
'; print ''; print ''; print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; print ''; $oldyear=0; @@ -298,22 +298,22 @@ foreach ($data as $val) print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ''; } print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ''; $oldyear=$year; } diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index 0d8c2064010..118bc3fbd37 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -82,9 +82,9 @@ if (count($linkedObjectBlock) > 1) - - - + + +
'.$langs->trans("Year").''.$langs->trans("NbOfProposals").'%'.$langs->trans("AmountTotal").'%'.$langs->trans("AmountAverage").'%'.$langs->trans("NbOfProposals").'%'.$langs->trans("AmountTotal").'%'.$langs->trans("AmountAverage").'%
0?'&userid='.$userid:'').'">'.$oldyear.'000000
0?'&userid='.$userid:'').'">'.$year.''.$val['nb'].''.round($val['nb_diff']).''.price(price2num($val['total'],'MT'),1).''.round($val['total_diff']).''.price(price2num($val['avg'],'MT'),1).''.round($val['avg_diff']).''.$val['nb'].''.round($val['nb_diff']).''.price(price2num($val['total'],'MT'),1).''.round($val['total_diff']).''.price(price2num($val['avg'],'MT'),1).''.round($val['avg_diff']).'