From b929641fe15a352f87be46ed7f5fe2ebec7b7505 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 29 Mar 2021 13:00:17 +0200 Subject: [PATCH] Look and feel v14 --- htdocs/comm/propal/list.php | 16 +++--- htdocs/compta/bank/bankentries_list.php | 4 +- htdocs/compta/bank/budget.php | 4 +- htdocs/compta/bank/releve.php | 4 +- htdocs/compta/bank/various_payment/list.php | 4 +- htdocs/compta/cashcontrol/report.php | 2 +- htdocs/compta/charges/index.php | 10 ++-- htdocs/compta/deplacement/stats/index.php | 8 ++- htdocs/compta/facture/card.php | 30 +++++----- htdocs/compta/facture/index.php | 6 +- htdocs/compta/facture/stats/index.php | 4 +- htdocs/compta/index.php | 30 +++++----- htdocs/compta/localtax/list.php | 2 +- htdocs/compta/localtax/quadri_detail.php | 16 +++--- htdocs/compta/paiement.php | 8 +-- htdocs/compta/paiement/card.php | 6 +- htdocs/compta/paiement/cheque/card.php | 4 +- htdocs/compta/paiement/cheque/index.php | 2 +- htdocs/compta/paiement/cheque/list.php | 2 +- htdocs/compta/paiement/list.php | 2 +- htdocs/compta/paiement/tovalidate.php | 2 +- htdocs/compta/paiement_charge.php | 6 +- htdocs/compta/paiement_vat.php | 6 +- htdocs/compta/payment_sc/card.php | 4 +- htdocs/compta/payment_vat/card.php | 4 +- htdocs/compta/paymentbybanktransfer/index.php | 4 +- htdocs/compta/prelevement/card.php | 2 +- htdocs/compta/prelevement/create.php | 2 +- htdocs/compta/prelevement/factures.php | 4 +- htdocs/compta/prelevement/fiche-rejet.php | 4 +- htdocs/compta/prelevement/index.php | 2 +- htdocs/compta/prelevement/line.php | 2 +- htdocs/compta/prelevement/list.php | 2 +- htdocs/compta/prelevement/orders_list.php | 2 +- htdocs/compta/recap-compta.php | 2 +- htdocs/compta/resultat/clientfourn.php | 56 +++++++++---------- htdocs/compta/resultat/result.php | 16 +++--- htdocs/compta/sociales/card.php | 2 +- htdocs/compta/sociales/payments.php | 2 +- htdocs/compta/tva/card.php | 2 +- htdocs/compta/tva/clients.php | 8 +-- htdocs/compta/tva/payments.php | 2 +- htdocs/compta/tva/quadri_detail.php | 12 ++-- htdocs/contrat/list.php | 12 ++-- htdocs/core/class/html.formcategory.class.php | 6 +- htdocs/don/list.php | 2 +- htdocs/fourn/commande/list.php | 12 ++-- htdocs/langs/en_US/bills.lang | 2 + htdocs/loan/list.php | 2 +- htdocs/margin/agentMargins.php | 8 +-- htdocs/margin/checkMargins.php | 26 +++++---- htdocs/margin/customerMargins.php | 6 +- htdocs/margin/productMargins.php | 6 +- htdocs/projet/list.php | 26 ++++----- htdocs/projet/tasks/list.php | 16 +++--- htdocs/salaries/list.php | 2 +- htdocs/supplier_proposal/list.php | 12 ++-- 57 files changed, 231 insertions(+), 219 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 453abff36b2..f5ac2ebae7a 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -843,31 +843,31 @@ if ($resql) { if ($user->rights->societe->client->voir || $socid) { $langs->load("commercial"); $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': '; - $moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200'); + $tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250'); $moreforfilter .= '
'; } // If the user can view prospects other than his' if ($user->rights->societe->client->voir || $socid) { $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('LinkedToSpecificUsers').': '; - $moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200'); + $tmptitle = $langs->trans('LinkedToSpecificUsers'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250'); $moreforfilter .= '
'; } // If the user can view products if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) { include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('IncludingProductWithTag').': '; + $tmptitle = $langs->trans('IncludingProductWithTag'); $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1); - $moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); $moreforfilter .= '
'; } if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': '; - $moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1); + $tmptitle = $langs->trans('CustomersProspectsCategoriesShort'); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle); $moreforfilter .= '
'; } $parameters = array(); diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 22121fa7664..fc017a9707b 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -1717,9 +1717,9 @@ if ($resql) { print ''.$langs->trans("Totalforthispage").''; } } elseif ($totalarray['totaldebfield'] == $i) { - print ''.price(-1 * $totalarray['totaldeb']).''; + print ''.price(-1 * $totalarray['totaldeb']).''; } elseif ($totalarray['totalcredfield'] == $i) { - print ''.price($totalarray['totalcred']).''; + print ''.price($totalarray['totalcred']).''; } elseif ($i == $posconciliatecol) { print ''; if ($user->rights->banque->consolidate && $action == 'reconcile') { diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index d3ffbb37916..3e40e45b58e 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -82,8 +82,8 @@ if ($result) { print ''; print "rowid\">$objp->label"; print ''.$objp->nombre.''; - print ''.price(abs($objp->somme)).""; - print ''.price(abs(price2num($objp->somme / $objp->nombre, 'MT'))).""; + print ''.price(abs($objp->somme)).""; + print ''.price(abs(price2num($objp->somme / $objp->nombre, 'MT'))).""; print ""; $i++; $total += abs($objp->somme); diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index be91d475d4d..dc71a1d2d27 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -346,7 +346,7 @@ if (empty($numref)) { $balancestart[$objp->numr] = $obj->amount; $db->free($resql); } - print ''.price($balancestart[$objp->numr], '', $langs, 1, -1, -1, $conf->currency).''; + print ''.price($balancestart[$objp->numr], '', $langs, 1, -1, -1, $conf->currency).''; // Calculate end amount $sql = "SELECT sum(b.amount) as amount"; @@ -359,7 +359,7 @@ if (empty($numref)) { $content[$objp->numr] = $obj->amount; $db->free($resql); } - print ''.price(($balancestart[$objp->numr] + $content[$objp->numr]), '', $langs, 1, -1, -1, $conf->currency).''; + print ''.price(($balancestart[$objp->numr] + $content[$objp->numr]), '', $langs, 1, -1, -1, $conf->currency).''; print ''; if ($user->rights->banque->consolidate && $action != 'editbankreceipt') { diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php index 65542598351..dcc1f4aef97 100644 --- a/htdocs/compta/bank/various_payment/list.php +++ b/htdocs/compta/bank/various_payment/list.php @@ -671,7 +671,7 @@ if ($result) { if ($arrayfields['debit']['checked']) { print ''; if ($obj->sens == 0) { - print price($obj->amount); + print ''.price($obj->amount).''; $totalarray['val']['total_deb'] += $obj->amount; } if (!$i) { @@ -687,7 +687,7 @@ if ($result) { if ($arrayfields['credit']['checked']) { print ''; if ($obj->sens == 1) { - print price($obj->amount); + print ''.price($obj->amount).''; $totalarray['val']['total_cred'] += $obj->amount; } if (!$i) { diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php index 95c18dbf261..ee13f5540a1 100644 --- a/htdocs/compta/cashcontrol/report.php +++ b/htdocs/compta/cashcontrol/report.php @@ -204,7 +204,7 @@ if ($resql) { { print ''; print ''.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").''; - print ''.price($cashcontrol->opening).''; + print ''.price($cashcontrol->opening).''; print ''; $first = "no"; }*/ diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index b238e47c50e..d3604b0d7cc 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -206,7 +206,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) { // Type print ''.$obj->label.''; // Expected to pay - print ''.price($obj->total).''; + print ''.price($obj->total).''; // Ref payment $payment_sc_static->id = $obj->pid; $payment_sc_static->ref = $obj->pid; @@ -323,7 +323,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) { $tva_static->ref = $obj->label; print "".$tva_static->getNomUrl(1)."\n"; - print ''.price($obj->amount_tva).""; + print ''.price($obj->amount_tva).""; // Ref payment $ptva_static->id = $obj->rowid; @@ -359,7 +359,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) { } // Paid - print ''.price($obj->amount).""; + print ''.price($obj->amount).""; print "\n"; $i++; @@ -442,7 +442,7 @@ while ($j < $numlt) { print "".$obj->label."\n"; - print ''.price($obj->amount).""; + print ''.price($obj->amount).""; // Ref payment $ptva_static->id = $obj->rowid; @@ -450,7 +450,7 @@ while ($j < $numlt) { print ''.$ptva_static->getNomUrl(1)."\n"; print ''.dol_print_date($db->jdate($obj->dp), 'day')."\n"; - print ''.price($obj->amount).""; + print ''.price($obj->amount).""; print "\n"; $i++; diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index 892b2b86dff..673cd7c1972 100644 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -268,7 +268,7 @@ print '

'; print '
'; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -280,14 +280,16 @@ foreach ($data as $val) { $year = $val['year']; while ($year && $oldyear > $year + 1) { // If we have empty year $oldyear--; - print ''; + print ''; print ''; print ''; print ''; print ''; print ''; } - print ''; + + // Total + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index fd8a9c1045d..35f4a3cb140 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -4733,8 +4733,8 @@ if ($action == 'create') { if (!empty($conf->banque->enabled)) { print ''; } - print ''; - print ''; + print ''; + print ''; print ''; print ''; } @@ -4753,8 +4753,8 @@ if ($action == 'create') { if (!empty($conf->banque->enabled)) { print ''; } - print ''; - print ''; + print ''; + print ''; print ''; print ''; @@ -4808,8 +4808,8 @@ if ($action == 'create') { if (!empty($conf->banque->enabled)) { print ''; } - print ''; - print ''; + print ''; + print ''; print ''; print ''; } @@ -4914,7 +4914,7 @@ if ($action == 'create') { } print ''; } - print ''; + print ''; print ''; - print ''; + print ''; print ''; @@ -4994,7 +4994,7 @@ if ($action == 'create') { print ''; print $form->textwithpicto($langs->trans("Discount"), $langs->trans("HelpEscompte"), - 1); print ''; - print ''; + print ''; $resteapayeraffiche = 0; $cssforamountpaymentcomplete = 'amountpaymentneutral'; } @@ -5014,7 +5014,7 @@ if ($action == 'create') { print ''; print $form->textwithpicto($langs->trans("ProductReturned"), $langs->trans("HelpAbandonProductReturned"), - 1); print ''; - print ''; + print ''; $resteapayeraffiche = 0; $cssforamountpaymentcomplete = 'amountpaymentneutral'; } @@ -5028,7 +5028,7 @@ if ($action == 'create') { print ''; print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1); print ''; - print ''; + print ''; $resteapayeraffiche = 0; $cssforamountpaymentcomplete = 'amountpaymentneutral'; } @@ -5037,7 +5037,7 @@ if ($action == 'create') { print ''; + print ''; // Remainder to pay print ''; - print ''; + print ''; print ''; // Retained warranty : usualy use on construction industry @@ -5076,10 +5076,10 @@ if ($action == 'create') { // Total already paid back print ''; + print ' :'; // Billed - print ''; + print ''; // Remainder to pay back print ''; $result .= ''; $result .= ''; - $result .= ''; + $result .= ''; $result .= ''; $i++; @@ -299,7 +299,7 @@ function getDraftTable($maxCount = 500, $socid = 0) } elseif ($total > 0) { $result .= ''; $result .= ''; - $result .= ''; + $result .= ''; $result .= ''; } @@ -508,7 +508,7 @@ function getOpenTable($maxCount = 500, $socid = 0) $result .= ''; $result .= ''; - $result .= ''; + $result .= ''; $result .= ''; diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index 96c414db350..9fcfff783b3 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -384,9 +384,9 @@ foreach ($data as $val) { print ''; print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; $oldyear = $year; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 9c3544b512e..a24bce0e0e2 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -351,7 +351,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU print ''; - print ''; + print ''; print ''; $tot_ttc += $obj->total_ttc; $i++; @@ -620,7 +620,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU print $thirdpartystatic->getNomUrl(1, 'supplier'); print ''; if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) { - print ''; + print ''; } print ''; print ''; @@ -951,7 +951,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user print $societestatic->getNomUrl(1, 'customer'); print ''; if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) { - print ''; + print ''; } print ''; print ''; @@ -974,10 +974,10 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user print ''; if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) { - print ''; + print ''; } - print ''; - print ''; + print ''; + print ''; print ''; print ''; print '
'.$langs->trans("Year").''.$langs->trans("Number").''.$langs->trans("AmountTotal").'
'.$oldyear.'000
'.$year.''.$val['nb'].''.price(price2num($val['total'], 'MT'), 1).''.price($prev_invoice->total_ht).''.price($prev_invoice->total_ttc).''.price($prev_invoice->total_ht).''.price($prev_invoice->total_ttc).''.$prev_invoice->getLibStatut(3, $tmptotalpaidforthisinvoice).'
'.price($object->total_ht).''.price($object->total_ttc).''.price($object->total_ht).''.price($object->total_ttc).''.$object->getLibStatut(3, $object->getSommePaiement()).'
'.price($next_invoice->total_ht).''.price($next_invoice->total_ttc).''.price($next_invoice->total_ht).''.price($next_invoice->total_ttc).''.$next_invoice->getLibStatut(3, $totalpaye).'
'.price($sign * $objp->amount).''.price($sign * $objp->amount).''; if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0) { print 'rowid.'">'; @@ -4972,7 +4972,7 @@ if ($action == 'create') { print $invoice->getNomUrl(0); print ''; print ''.price($obj->amount_ttc).''.price($obj->amount_ttc).''; print 'rowid.'">'.img_delete().''; print '
'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' 
'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' 
'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' 
'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' 
'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' 
'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' 
'; print ''; print $langs->trans("Billed"); - print ''.price($object->total_ttc).' 
'.price($object->total_ttc).' 
'; print ''; @@ -5047,7 +5047,7 @@ if ($action == 'create') { } print ''; print ''.price($resteapayeraffiche).''.price($resteapayeraffiche).' 
'; print $langs->trans('AlreadyPaidBack'); - print ' :'.price($sign * $totalpaye).' 
'.price($sign * $totalpaye).' 
'.$langs->trans("Billed").' :'.price($sign * $object->total_ttc).' 
'.$langs->trans("Billed").' :'.price($sign * $object->total_ttc).' 
'; diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php index a4d6dd6fec7..ba0d8e2f2aa 100644 --- a/htdocs/compta/facture/index.php +++ b/htdocs/compta/facture/index.php @@ -285,7 +285,7 @@ function getDraftTable($maxCount = 500, $socid = 0) $result .= '
'.$objectstatic->getNomUrl(1).''.$companystatic->getNomUrl(1, 'customer', 24).''.price($obj->total_ttc).''.price($obj->total_ttc).'
'.$langs->trans("Total").''.price($total).''.price($total).'
'.$companystatic->getNomUrl(1, 'customer', 44).''.dol_print_date($db->jdate($obj->df), 'day').''.price($obj->total_ttc).''.price($obj->total_ttc).'
0 ? '&userid='.$userid : '').'">'.$year.''.$val['nb'].''.round($val['nb_diff']).''.price(price2num($val['total'], 'MT'), 1).''.price(price2num($val['total'], 'MT'), 1).''.round($val['total_diff']).''.price(price2num($val['avg'], 'MT'), 1).''.price(price2num($val['avg'], 'MT'), 1).''.round($val['avg_diff']).'
'; print $companystatic->getNomUrl(1, 'supplier'); print ''.price($obj->total_ttc).''.price($obj->total_ttc).'
'.price($obj->total_ht).''.price($obj->total_ht).''.price($obj->total_ttc).''.dol_print_date($db->jdate($obj->tms), 'day').''.price($obj->total_ht).''.price($obj->total_ht).''.price($obj->total_ttc).''.price($obj->total_ttc - $obj->tot_fttc).'
'.$langs->trans("Total").'   ('.$langs->trans("RemainderToBill").': '.price($tot_tobill).') '.price($tot_ht).''.price($tot_ht).''.price($tot_ttc).''.price($tot_tobill).''.price($tot_ttc).''.price($tot_tobill).' 

'; @@ -1110,10 +1110,10 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire) { print ''; print ''.dol_print_date($db->jdate($obj->datelimite), 'day').''; if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) { - print ''.price($obj->total_ht).''; + print ''.price($obj->total_ht).''; } - print ''.price($obj->total_ttc).''; - print ''.price($obj->am).''; + print ''.price($obj->total_ttc).''; + print ''.price($obj->am).''; print ''.$tmpinvoice->getLibStatut(3, $obj->am).''; print ''; @@ -1139,10 +1139,10 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire) { print ''.$langs->trans("Total").'   ('.$langs->trans("RemainderToTake").': '.price($total_ttc - $totalam).') '; print ' '; if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) { - print ''.price($total).''; + print ''.price($total).''; } - print ''.price($total_ttc).''; - print ''.price($totalam).''; + print ''.price($total_ttc).''; + print ''.price($totalam).''; print ' '; print ''; } else { @@ -1260,10 +1260,10 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU print ''.$societestatic->getNomUrl(1, 'supplier').''; print ''.dol_print_date($db->jdate($obj->date_lim_reglement), 'day').''; if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) { - print ''.price($obj->total_ht).''; + print ''.price($obj->total_ht).''; } - print ''.price($obj->total_ttc).''; - print ''.price($obj->am).''; + print ''.price($obj->total_ttc).''; + print ''.price($obj->am).''; print ''.$facstatic->getLibStatut(3, $obj->am).''; print ''; $total += $obj->total_ht; diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php index 8742589a6a9..dd77938366a 100644 --- a/htdocs/compta/localtax/list.php +++ b/htdocs/compta/localtax/list.php @@ -91,7 +91,7 @@ if ($result) { $i++; } print ''.$langs->trans("Total").''; - print ''.price($total).''; + print ''.price($total).''; print ""; $db->free($result); diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php index a2904c861f4..969376209eb 100644 --- a/htdocs/compta/localtax/quadri_detail.php +++ b/htdocs/compta/localtax/quadri_detail.php @@ -492,8 +492,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) { print ' '; print ' '; } - print ''.price(price2num($subtot_coll_total_ht, 'MT')).''; - print ''.price(price2num($subtot_coll_vat, 'MT')).''; + print ''.price(price2num($subtot_coll_total_ht, 'MT')).''; + print ''.price(price2num($subtot_coll_vat, 'MT')).''; print ''; } @@ -505,8 +505,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) { print ' '; print ' '; } - print ''.price(price2num(0, 'MT')).''; - print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; print ''; } @@ -643,8 +643,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) { print ' '; print ' '; } - print ''.price(price2num($subtot_paye_total_ht, 'MT')).''; - print ''.price(price2num($subtot_paye_vat, 'MT')).''; + print ''.price(price2num($subtot_paye_total_ht, 'MT')).''; + print ''.price(price2num($subtot_paye_vat, 'MT')).''; print ''; } @@ -656,8 +656,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) { print ' '; print ' '; } - print ''.price(price2num(0, 'MT')).''; - print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; print ''; } diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 7f03f4a569c..94b114c03d8 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -713,17 +713,17 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie } // Price - print ''.price($sign * $objp->total_ttc).''; + print ''.price($sign * $objp->total_ttc).''; // Received + already paid - print ''.price($sign * $paiement); + print ''.price($sign * $paiement); if ($creditnotes) { print '+'.price($creditnotes).''; } if ($deposits) { print '+'.price($deposits).''; } - print ''; + print ''; // Remain to take or to pay back print ''.price($sign * $remaintopay).''; @@ -901,7 +901,7 @@ if (!GETPOST('action', 'aZ09')) { print ''.$objp->ref."\n"; print ''.dol_print_date($db->jdate($objp->dp))."\n"; print ''.$objp->paiement_type.' '.$objp->num_payment."\n"; - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; print ' '; print ''; diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index 9096bfa5e5d..d43e1a2c84b 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -365,13 +365,13 @@ if ($resql) { print ''; } // Expected to pay - print ''.price($objp->total_ttc).''; + print ''.price($objp->total_ttc).''; // Amount payed - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; // Remain to pay - print ''.price($remaintopay).''; + print ''.price($remaintopay).''; // Status print ''.$invoice->getLibStatut(5, $alreadypayed).''; diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 86153e4b38d..39b5ded892b 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -462,7 +462,7 @@ if ($action == 'new') { print ''.$value["numero"]."\n"; print ''.$value["emetteur"]."\n"; print ''.$value["banque"]."\n"; - print ''.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).''; + print ''.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).''; // Link to payment print ''; @@ -639,7 +639,7 @@ if ($action == 'new') { print ''.($objp->num_chq ? $objp->num_chq : ' ').''; print ''.dol_trunc($objp->emetteur, 24).''; print ''.dol_trunc($objp->banque, 24).''; - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; // Link to payment print ''; $paymentstatic->id = $objp->pid; diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 8bdbb7478a7..8bde7fac19e 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -131,7 +131,7 @@ if ($resql) { print ''.dol_print_date($db->jdate($objp->db), 'day').''; print ''.$accountstatic->getNomUrl(1).''; print ''.$objp->nbcheque.''; - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; print ''.$checkdepositstatic->LibStatut($objp->statut, 3).''; print ''; diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index c13472dd1fe..0c4a6d9c478 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -228,7 +228,7 @@ if ($resql) { print ''.$objp->nbcheque.''; // Amount - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; // Statut print ''; diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index 75c63620b0b..1e99cf8676f 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -547,7 +547,7 @@ while ($i < min($num, $limit)) { // Amount if (!empty($arrayfields['p.amount']['checked'])) { - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; if (!$i) { $totalarray['nbfield']++; } diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php index f41d40115b6..4e464243df6 100644 --- a/htdocs/compta/paiement/tovalidate.php +++ b/htdocs/compta/paiement/tovalidate.php @@ -120,7 +120,7 @@ if ($resql) { print ''.img_object($langs->trans("ShowPayment"), "payment").' '.$objp->rowid.''; print ''.dol_print_date($db->jdate($objp->dp), 'day')."\n"; print "$objp->paiement_type $objp->num_payment\n"; - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; print ''; if ($objp->statut == 0) { diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index e796f039f80..6b47dacdd9d 100644 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -266,11 +266,11 @@ if ($action == 'create') { print "!!!\n"; } - print ''.price($objp->amount).""; + print ''.price($objp->amount).""; - print ''.price($sumpaid).""; + print ''.price($sumpaid).""; - print ''.price($objp->amount - $sumpaid).""; + print ''.price($objp->amount - $sumpaid).""; print ''; if ($sumpaid < $objp->amount) { diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php index 7fc81e5ac27..64952def30d 100644 --- a/htdocs/compta/paiement_vat.php +++ b/htdocs/compta/paiement_vat.php @@ -262,11 +262,11 @@ if ($action == 'create') { print "!!!\n"; } - print ''.price($objp->amount).""; + print ''.price($objp->amount).""; - print ''.price($sumpaid).""; + print ''.price($sumpaid).""; - print ''.price($objp->amount - $sumpaid).""; + print ''.price($objp->amount - $sumpaid).""; print ''; diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php index 7be99cead28..c3640c1a760 100644 --- a/htdocs/compta/payment_sc/card.php +++ b/htdocs/compta/payment_sc/card.php @@ -207,11 +207,11 @@ if ($resql) { // Label print ''.$objp->label.''; // Expected to pay - print ''.price($objp->sc_amount).''; + print ''.price($objp->sc_amount).''; // Status print ''.$socialcontrib->getLibStatut(4, $objp->amount).''; // Amount paid - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; print "\n"; if ($objp->paye == 1) { // If at least one invoice is paid, disable delete $disable_delete = 1; diff --git a/htdocs/compta/payment_vat/card.php b/htdocs/compta/payment_vat/card.php index 70d958932e5..b671492c346 100644 --- a/htdocs/compta/payment_vat/card.php +++ b/htdocs/compta/payment_vat/card.php @@ -263,11 +263,11 @@ if ($resql) { // Label print ''.$objp->label.''; // Expected to pay - print ''.price($objp->tva_amount).''; + print ''.price($objp->tva_amount).''; // Status print ''.$tva->getLibStatut(4, $objp->amount).''; // Amount payed - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; print "\n"; if ($objp->paye == 1) { // If at least one invoice is paid, disable delete $disable_delete = 1; diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php index a705353112c..c77ad6ea7e3 100644 --- a/htdocs/compta/paymentbybanktransfer/index.php +++ b/htdocs/compta/paymentbybanktransfer/index.php @@ -216,8 +216,8 @@ if ($result) { print $bprev->getNomUrl(1); print "\n"; print ''.dol_print_date($db->jdate($obj->datec), "dayhour")."\n"; - print ''.price($obj->amount)."\n"; - print ''.$bprev->getLibStatut(3)."\n"; + print ''.price($obj->amount)."\n"; + print ''.$bprev->getLibStatut(3)."\n"; print "\n"; $i++; diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index d04e7131edc..20a11effdad 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -423,7 +423,7 @@ if ($id > 0 || $ref) { print $thirdparty->getNomUrl(1); print "\n"; - print ''.price($obj->amount)."\n"; + print ''.price($obj->amount)."\n"; print ''; diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index e12c50b75f5..6793fb0a893 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -503,7 +503,7 @@ if ($result) print ''.dol_print_date($db->jdate($obj->datec),'day')."\n"; - print ''.price($obj->amount,0,$langs,0,0,-1,$conf->currency)."\n"; + print ''.price($obj->amount,0,$langs,0,0,-1,$conf->currency)."\n"; print "\n"; $i++; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 23511a4a00a..9cfeb860d33 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -281,10 +281,10 @@ if ($resql) { print "\n"; // Amount of invoice - print ''.price($obj->total_ttc)."\n"; + print ''.price($obj->total_ttc)."\n"; // Amount requested - print ''.price($obj->amount_requested)."\n"; + print ''.price($obj->amount_requested)."\n"; // Status of requests print ''; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 9a4f209e134..b202d8ce0b7 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -222,7 +222,7 @@ if ($resql) { print ''; print ''.$obj->name."\n"; - print ''.price($obj->amount)."\n"; + print ''.price($obj->amount)."\n"; print ''.$rej->motifs[$obj->motif].''; print ''.yn($obj->afacturer).''; @@ -240,7 +240,7 @@ if ($resql) { if ($num > 0) { print ' '; print ''.$langs->trans("Total").''; - print ''.price($total)."\n"; + print ''.price($total)."\n"; print ' '; print "\n"; } diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 6e537159721..77595d53ace 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -218,7 +218,7 @@ if ($result) { print $bprev->getNomUrl(1); print "\n"; print ''.dol_print_date($db->jdate($obj->datec), "dayhour")."\n"; - print ''.price($obj->amount)."\n"; + print ''.price($obj->amount)."\n"; print ''.$bprev->getLibStatut(3)."\n"; print "\n"; diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php index 73c985355b1..dce5dd39b60 100644 --- a/htdocs/compta/prelevement/line.php +++ b/htdocs/compta/prelevement/line.php @@ -301,7 +301,7 @@ if ($id) { print ''; print img_object($langs->trans("ShowCompany"), "company").' '.$obj->name."\n"; - print ''.price($obj->total_ttc)."\n"; + print ''.price($obj->total_ttc)."\n"; print ''; $invoicestatic->fetch($obj->facid); diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index a966e8e8b93..0818dbb61d1 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -266,7 +266,7 @@ if ($result) { print ''.dol_print_date($db->jdate($obj->datec), 'day')."\n"; - print ''.price($obj->amount)."\n"; + print ''.price($obj->amount)."\n"; print ' '; diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php index eda6be0cd98..5c6f058bff1 100644 --- a/htdocs/compta/prelevement/orders_list.php +++ b/htdocs/compta/prelevement/orders_list.php @@ -205,7 +205,7 @@ if ($result) { print ''.dol_print_date($db->jdate($obj->datec), 'day')."\n"; - print ''.price($obj->amount)."\n"; + print ''.price($obj->amount)."\n"; print ''; print $bon->LibStatut($obj->statut, 3); diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index f7abdab9c79..9f9ee72cc6d 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -286,7 +286,7 @@ if ($id > 0) { $totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']); // Balance - print ''.price($data['balance'])."\n"; + print ''.price($data['balance'])."\n"; // Author print ''; diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index a22c0c51b73..14fc650db97 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -311,7 +311,7 @@ if ($modecompta == 'BOOKKEEPING') { print ''; print ' '; print ''.$objp->pcg_type.($objp->name ? ' ('.$objp->name.')' : '')."\n"; - print ''.price($objp->amount)."\n"; + print ''.price($objp->amount)."\n"; print "\n"; $total_ht += (isset($objp->amount) ? $objp->amount : 0); @@ -350,7 +350,7 @@ if ($modecompta == 'BOOKKEEPING') { print ''; print ''; print '     '.length_accountg($cpt['account_number']).' - '.$cpt['account_label'].''; - print ''.price($resultN).''; + print ''.price($resultN).''; print "\n"; } } @@ -420,9 +420,9 @@ if ($modecompta == 'BOOKKEEPING') { print "".$langs->trans("Bills").' '.$objp->name."\n"; if ($modecompta == 'CREANCES-DETTES') { - print ''.price($objp->amount_ht)."\n"; + print ''.price($objp->amount_ht)."\n"; } - print ''.price($objp->amount_ttc)."\n"; + print ''.price($objp->amount_ttc)."\n"; $total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0); $total_ttc += $objp->amount_ttc; @@ -465,9 +465,9 @@ if ($modecompta == 'BOOKKEEPING') { print "".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n"; if ($modecompta == 'CREANCES-DETTES') { - print ''.price($objp->amount_ht)."\n"; + print ''.price($objp->amount_ht)."\n"; } - print ''.price($objp->amount_ttc)."\n"; + print ''.price($objp->amount_ttc)."\n"; $total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0); $total_ttc += $objp->amount_ttc; @@ -557,9 +557,9 @@ if ($modecompta == 'BOOKKEEPING') { print "".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name." ".$obj->firstname." ".$obj->lastname."\n"; if ($modecompta == 'CREANCES-DETTES') { - print ''.price($obj->amount).''; + print ''.price($obj->amount).''; } - print ''.price($obj->amount).''; + print ''.price($obj->amount).''; print ''; $i++; } @@ -638,9 +638,9 @@ if ($modecompta == 'BOOKKEEPING') { print "".$langs->trans("Bills")." socid."\">".$objp->name."\n"; if ($modecompta == 'CREANCES-DETTES') { - print ''.price(-$objp->amount_ht)."\n"; + print ''.price(-$objp->amount_ht)."\n"; } - print ''.price(-$objp->amount_ttc)."\n"; + print ''.price(-$objp->amount_ttc)."\n"; $total_ht -= (isset($objp->amount_ht) ? $objp->amount_ht : 0); $total_ttc -= $objp->amount_ttc; @@ -733,9 +733,9 @@ if ($modecompta == 'BOOKKEEPING') { print ' '; print ''.$obj->label.''; if ($modecompta == 'CREANCES-DETTES') { - print ''.price(-$obj->amount).''; + print ''.price(-$obj->amount).''; } - print ''.price(-$obj->amount).''; + print ''.price(-$obj->amount).''; print ''; $i++; } @@ -820,9 +820,9 @@ if ($modecompta == 'BOOKKEEPING') { print ' '; print ''.$obj->label.''; if ($modecompta == 'CREANCES-DETTES') { - print ''.price(-$obj->amount).''; + print ''.price(-$obj->amount).''; } - print ''.price(-$obj->amount).''; + print ''.price(-$obj->amount).''; print ''; $i++; } @@ -903,9 +903,9 @@ if ($modecompta == 'BOOKKEEPING') { print "".$langs->trans("Salary")." fk_user."\">".$obj->firstname." ".$obj->lastname."\n"; if ($modecompta == 'CREANCES-DETTES') { - print ''.price(-$obj->amount).''; + print ''.price(-$obj->amount).''; } - print ''.price(-$obj->amount).''; + print ''.price(-$obj->amount).''; print ''; $i++; } @@ -989,9 +989,9 @@ if ($modecompta == 'BOOKKEEPING') { print "".$langs->trans("ExpenseReport")." userid."\">".$obj->firstname." ".$obj->lastname."\n"; if ($modecompta == 'CREANCES-DETTES') { - print ''.price(-$obj->amount_ht).''; + print ''.price(-$obj->amount_ht).''; } - print ''.price(-$obj->amount_ttc).''; + print ''.price(-$obj->amount_ttc).''; print ''; } } else { @@ -1050,9 +1050,9 @@ if ($modecompta == 'BOOKKEEPING') { print ' '; print "".$langs->trans("Debit")."\n"; if ($modecompta == 'CREANCES-DETTES') { - print ''.price(-$obj->amount).''; + print ''.price(-$obj->amount).''; } - print ''.price(-$obj->amount)."\n"; + print ''.price(-$obj->amount)."\n"; print "\n"; // Credit (payment received from customer for example) @@ -1067,9 +1067,9 @@ if ($modecompta == 'BOOKKEEPING') { print ' '; print "".$langs->trans("Credit")."\n"; if ($modecompta == 'CREANCES-DETTES') { - print ''.price($obj->amount).''; + print ''.price($obj->amount).''; } - print ''.price($obj->amount)."\n"; + print ''.price($obj->amount)."\n"; print "\n"; // Total @@ -1117,9 +1117,9 @@ if ($modecompta == 'BOOKKEEPING') { print ' '; print "".$loan_static->getNomUrl(1).' - '.$obj->label."\n"; if ($modecompta == 'CREANCES-DETTES') { - print ''.price(-$obj->amount).''; + print ''.price(-$obj->amount).''; } - print ''.price(-$obj->amount)."\n"; + print ''.price(-$obj->amount)."\n"; print "\n"; $subtotal_ht -= $obj->amount; $subtotal_ttc -= $obj->amount; @@ -1205,7 +1205,7 @@ if ($modecompta == 'BOOKKEEPING') { print ' '; print "".$langs->trans("VATToPay")."\n"; print ' '."\n"; - print ''.price($amount)."\n"; + print ''.price($amount)."\n"; print "\n"; // VAT to retreive @@ -1263,7 +1263,7 @@ if ($modecompta == 'BOOKKEEPING') { print ' '; print ''.$langs->trans("VATToCollect")."\n"; print ' '."\n"; - print ''.price($amount)."\n"; + print ''.price($amount)."\n"; print "\n"; } else { // VAT really already paid @@ -1319,7 +1319,7 @@ if ($modecompta == 'BOOKKEEPING') { if ($modecompta == 'CREANCES-DETTES') { print ''."\n"; } - print ''.price($amount)."\n"; + print ''.price($amount)."\n"; print "\n"; // VAT really received @@ -1375,7 +1375,7 @@ if ($modecompta == 'BOOKKEEPING') { if ($modecompta == 'CREANCES-DETTES') { print ''."\n"; } - print ''.price($amount)."\n"; + print ''.price($amount)."\n"; print "\n"; } } diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php index 8ef75bf5846..67bc2d2e61f 100644 --- a/htdocs/compta/resultat/result.php +++ b/htdocs/compta/resultat/result.php @@ -500,18 +500,18 @@ if ($modecompta == 'CREANCES-DETTES') { } print ''; - print ''.price($totCat['NP']).''; - print ''.price($totCat['N']).''; + print ''.price($totCat['NP']).''; + print ''.price($totCat['N']).''; // Each month foreach ($totCat['M'] as $k => $v) { if (($k + 1) >= $date_startmonth) { - print ''.price($v).''; + print ''.price($v).''; } } foreach ($totCat['M'] as $k => $v) { if (($k + 1) < $date_startmonth) { - print ''.price($v).''; + print ''.price($v).''; } } @@ -531,20 +531,20 @@ if ($modecompta == 'CREANCES-DETTES') { print ' - '; print $cpt['account_label']; print ''; - print ''.price($resultNP).''; - print ''.price($resultN).''; + print ''.price($resultNP).''; + print ''.price($resultN).''; // Make one call for each month foreach ($months as $k => $v) { if (($k + 1) >= $date_startmonth) { $resultM = $totPerAccount[$cpt['account_number']]['M'][$k]; - print ''.price($resultM).''; + print ''.price($resultM).'/td>'; } } foreach ($months as $k => $v) { if (($k + 1) < $date_startmonth) { $resultM = $totPerAccount[$cpt['account_number']]['M'][$k]; - print ''.price($resultM).''; + print ''.price($resultM).''; } } print "\n"; diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index c26c62fb7ed..b8562829066 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -677,7 +677,7 @@ if ($id > 0) { } print ''; } - print ''.price($objp->amount)."\n"; + print ''.price($objp->amount)."\n"; print ""; $totalpaye += $objp->amount; $i++; diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php index 21f599f42dc..99d8efd3665 100644 --- a/htdocs/compta/sociales/payments.php +++ b/htdocs/compta/sociales/payments.php @@ -262,7 +262,7 @@ while ($i < min($num, $limit)) { // Type print ''.$obj->label.''; // Expected to pay - print ''.price($obj->total).''; + print ''.price($obj->total).''; // Ref payment $payment_sc_static->id = $obj->pid; $payment_sc_static->ref = $obj->pid; diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index fdb1e3336df..2a116c6376b 100755 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -675,7 +675,7 @@ if ($id) { } print ''; } - print ''.price($objp->amount)."\n"; + print ''.price($objp->amount)."\n"; print ""; $totalpaye += $objp->amount; $i++; diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 5b990258672..7860f7e3c02 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -558,8 +558,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) { print ' '; print ' '; } - print ''.price(price2num($subtot_coll_total_ht, 'MT')).''; - print ''.price(price2num($subtot_coll_vat, 'MT')).''; + print ''.price(price2num($subtot_coll_total_ht, 'MT')).''; + print ''.price(price2num($subtot_coll_vat, 'MT')).''; print ''; } } @@ -748,8 +748,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) { print ' '; print ' '; } - print ''.price(price2num($subtot_paye_total_ht, 'MT')).''; - print ''.price(price2num($subtot_paye_vat, 'MT')).''; + print ''.price(price2num($subtot_paye_total_ht, 'MT')).''; + print ''.price(price2num($subtot_paye_vat, 'MT')).''; print ''; } } diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php index 4eec7ca85a1..2ec4ef5bbd5 100644 --- a/htdocs/compta/tva/payments.php +++ b/htdocs/compta/tva/payments.php @@ -204,7 +204,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) { $date = $obj->datev; print ''.dol_print_date($date, 'day').''; // Expected to pay - print ''.price($obj->total).''; + print ''.price($obj->total).''; // Paid print ''; if ($obj->totalpaye) { diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index d3871968ed5..acf0bec8899 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -595,8 +595,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) { print ' '; print ' '; } - print ''.price(price2num($subtot_coll_total_ht, 'MT')).''; - print ''.price(price2num($subtot_coll_vat, 'MT')).''; + print ''.price(price2num($subtot_coll_total_ht, 'MT')).''; + print ''.price(price2num($subtot_coll_vat, 'MT')).''; print ''; } @@ -831,8 +831,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) { print ' '; print ' '; } - print ''.price(price2num($subtot_paye_total_ht, 'MT')).''; - print ''.price(price2num($subtot_paye_vat, 'MT')).''; + print ''.price(price2num($subtot_paye_total_ht, 'MT')).''; + print ''.price(price2num($subtot_paye_vat, 'MT')).''; print ''; } @@ -844,8 +844,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) { print ' '; print ' '; } - print ''.price(price2num(0, 'MT')).''; - print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; print ''; } diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 27cbf5a3a70..60215abb847 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -488,24 +488,24 @@ $moreforfilter = ''; if ($user->rights->societe->client->voir || $socid) { $langs->load("commercial"); $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': '; - $moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200'); + $tmpttile = $langs->trans('ThirdPartiesOfSaleRepresentative'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmpttile, 'maxwidth250'); $moreforfilter .= '
'; } // If the user can view other users if ($user->rights->user->user->lire) { $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('LinkedToSpecificUsers').': '; - $moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200'); + $tmpttile = $langs->trans('LinkedToSpecificUsers'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmpttile, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250'); $moreforfilter .= '
'; } // If the user can view categories of products if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) { include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('IncludingProductWithTag').': '; + $tmpttile = $langs->trans('IncludingProductWithTag'); $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1); - $moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmpttile, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); $moreforfilter .= '
'; } diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php index 320a1cd2a49..518a8f93290 100644 --- a/htdocs/core/class/html.formcategory.class.php +++ b/htdocs/core/class/html.formcategory.class.php @@ -49,11 +49,13 @@ class FormCategory extends Form $categoryArray = $this->select_all_categories($type, "", "", 64, 0, 1); $categoryArray[-2] = "- ".$langs->trans('NotCategorized')." -"; + $tmptitle = $langs->trans("Category"); + $filter = ''; $filter .= '
'; - $filter .= img_picto($langs->trans("Categories"), 'category', 'class="pictofixedwidth"'); + $filter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"'); //$filter .= $langs->trans('Categories').": "; - $filter .= Form::multiselectarray($htmlName, $categoryArray, $preSelected, 0, 0, "minwidth300"); + $filter .= Form::multiselectarray($htmlName, $categoryArray, $preSelected, 0, 0, "minwidth300", 0, 0, '', '', $tmptitle); $filter .= "
"; return $filter; diff --git a/htdocs/don/list.php b/htdocs/don/list.php index 9a2d1402e17..6e06071bde7 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -292,7 +292,7 @@ if ($resql) { } print "\n"; } - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; print ''.$donationstatic->LibStatut($objp->status, 5).''; print ''; print ""; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 09834f5c2af..2417563c176 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -970,24 +970,24 @@ if ($resql) { if ($user->rights->societe->client->voir || $socid) { $langs->load("commercial"); $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': '; - $moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200'); + $tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250'); $moreforfilter .= '
'; } // If the user can view other users if ($user->rights->user->user->lire) { $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('LinkedToSpecificUsers').': '; - $moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200'); + $tmptitle = $langs->trans('LinkedToSpecificUsers'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250'); $moreforfilter .= '
'; } // If the user can view prospects other than his' if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) { include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('IncludingProductWithTag').': '; + $tmptitle = $langs->trans('IncludingProductWithTag'); $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1); - $moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); $moreforfilter .= '
'; } $parameters = array(); diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 11b6f5bf1fe..45a461564b5 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -82,6 +82,8 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Refunds already done PaymentRule=Payment rule PaymentMode=Payment Type +DefaultPaymentMode=Default Payment Type +DefaultBankAccount=Default Bank Account PaymentTypeDC=Debit/Credit Card PaymentTypePP=PayPal IdPaymentMode=Payment Type (id) diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php index 9040d140149..fa1de74b0cc 100644 --- a/htdocs/loan/list.php +++ b/htdocs/loan/list.php @@ -252,7 +252,7 @@ if ($resql) { print ''.dol_trunc($obj->label, 42).''; // Capital - print ''.price($obj->capital).''; + print ''.price($obj->capital).''; // Date start print ''.dol_print_date($db->jdate($obj->datestart), 'day').''; diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 9042ed16dac..a27393c8bb2 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -197,7 +197,7 @@ $sql .= $db->order($sortfield, $sortorder); print '
'; -print img_info('').' '.$langs->trans("MarginPerSaleRepresentativeWarning").'
'; +print ''.$langs->trans("MarginPerSaleRepresentativeWarning").'
'; $param = ''; if (!empty($agentid)) { @@ -326,9 +326,9 @@ if ($result) { print ''; print "".$group_array['htmlname']."\n"; - print ''.price(price2num($pv, 'MT')).''; - print ''.price(price2num($pa, 'MT')).''; - print ''.price(price2num($marge, 'MT')).''; + print ''.price(price2num($pv, 'MT')).''; + print ''.price(price2num($pa, 'MT')).''; + print ''.price(price2num($marge, 'MT')).''; if (!empty($conf->global->DISPLAY_MARGIN_RATES)) { print ''.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").''; } diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php index 43ff6ef6b9f..d12c827cc3e 100644 --- a/htdocs/margin/checkMargins.php +++ b/htdocs/margin/checkMargins.php @@ -209,10 +209,10 @@ $massactionbutton = ''; $invoice_status_except_list = array(Facture::STATUS_DRAFT, Facture::STATUS_ABANDONED); $sql = "SELECT"; -$sql .= " f.ref, f.rowid as invoiceid, d.rowid as invoicedetid, d.buy_price_ht, d.total_ht, d.subprice, d.label, d.description , d.qty"; -$sql .= " ,d.fk_product"; +$sql .= " f.ref, f.rowid as invoiceid,"; +$sql .= " d.rowid as invoicedetid, d.product_type, d.buy_price_ht, d.total_ht, d.subprice, d.label, d.description, d.qty, d.fk_product"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f "; -$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as d ON d.fk_facture = f.rowid"; +$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as d ON d.fk_facture = f.rowid"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid"; $sql .= " WHERE f.fk_statut NOT IN (".$db->sanitize(implode(', ', $invoice_status_except_list)).")"; $sql .= " AND f.entity IN (".getEntity('invoice').") "; @@ -279,12 +279,12 @@ if ($result) { print ''; print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder); - print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", $param, 'width=20%', $sortfield, $sortorder); - print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "d.subprice", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "d.total_ht", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); + print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder); + print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "d.subprice", "", $param, '', $sortfield, $sortorder, 'right '); + print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $param, '', $sortfield, $sortorder, 'right '); + print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $param, '', $sortfield, $sortorder, 'right '); + print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "d.total_ht", "", $param, '', $sortfield, $sortorder, 'right '); + print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center '); print "\n"; $i = 0; @@ -309,6 +309,12 @@ if ($result) { print $productstatic->getNomUrl(1); } } else { + if ($objp->product_type == $productstatic::TYPE_PRODUCT) { + print img_picto('', 'product'); + } + if ($objp->product_type == $productstatic::TYPE_SERVICE) { + print img_picto('', 'service'); + } print $objp->label; print ' '; print $objp->description; @@ -324,7 +330,7 @@ if ($result) { print $objp->qty; print ''; print ''; - print price($objp->total_ht); + print ''.price($objp->total_ht).''; print ''; print ''; diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index e24d318bafc..66e5dc5ffbf 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -344,9 +344,9 @@ if ($result) { print ''.$companystatic->getNomUrl(1, 'margin').''; } - print ''.price(price2num($pv, 'MT')).''; - print ''.price(price2num($pa, 'MT')).''; - print ''.price(price2num($marge, 'MT')).''; + print ''.price(price2num($pv, 'MT')).''; + print ''.price(price2num($pa, 'MT')).''; + print ''.price(price2num($marge, 'MT')).''; if (!empty($conf->global->DISPLAY_MARGIN_RATES)) { print ''.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").''; } diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index a101848bfa1..2914d554fad 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -310,9 +310,9 @@ if ($result) { //print "".$product_static->getNomUrl(1)."\n"; } print ''.$qty.''; - print ''.price(price2num($pv, 'MT')).''; - print ''.price(price2num($pa, 'MT')).''; - print ''.price(price2num($marge, 'MT')).''; + print ''.price(price2num($pv, 'MT')).''; + print ''.price(price2num($pa, 'MT')).''; + print ''.price(price2num($marge, 'MT')).''; if (!empty($conf->global->DISPLAY_MARGIN_RATES)) { print ''.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").''; } diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 976e29b55bf..6ab17b6feee 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -678,32 +678,32 @@ if ($search_all) { $moreforfilter = ''; -// Filter on categories -if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) { - $formcategory = new FormCategory($db); - $moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array); -} - // If the user can view user other than himself $moreforfilter .= '
'; -$moreforfilter .= $langs->trans('ProjectsWithThisUserAsContact').': '; +$tmptitle = $langs->trans('ProjectsWithThisUserAsContact'); //$includeonly = 'hierarchyme'; $includeonly = ''; if (empty($user->rights->user->user->lire)) { $includeonly = array($user->id); } -$moreforfilter .= $form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200'); +$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', $tmptitle, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth250'); $moreforfilter .= '
'; // If the user can view thirdparties other than his' if ($user->rights->societe->client->voir || $socid) { $langs->load("commercial"); $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': '; - $moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200'); + $tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250'); $moreforfilter .= '
'; } +// Filter on categories +if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) { + $formcategory = new FormCategory($db); + $moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array); +} + if (!empty($moreforfilter)) { print '
'; print $moreforfilter; @@ -1243,7 +1243,7 @@ while ($i < min($num, $limit)) { $totalarray['pos'][$totalarray['nbfield']] = 'p.price_registration'; } } - // PriceOfBooth + // Price of booth if (!empty($arrayfields['p.price_booth']['checked'])) { print ''; if ($obj->price_booth != '') { @@ -1266,7 +1266,7 @@ while ($i < min($num, $limit)) { print $hookmanager->resPrint; // Date creation if (!empty($arrayfields['p.datec']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser'); print ''; if (!$i) { @@ -1275,7 +1275,7 @@ while ($i < min($num, $limit)) { } // Date modification if (!empty($arrayfields['p.tms']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser'); print ''; if (!$i) { diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index cb89a210e1e..7156d94ef21 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -588,29 +588,29 @@ $morehtmlfilter = ''; if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('ProjectCategories').': '; - $moreforfilter .= $formother->select_categories('project', $search_categ, 'search_categ', 1, 'maxwidth300'); + $tmptitle = $langs->trans('ProjectCategories'); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('project', $search_categ, 'search_categ', 0, $tmptitle, 'maxwidth300'); $moreforfilter .= '
'; } // If the user can view users $moreforfilter .= '
'; -$moreforfilter .= $langs->trans('ProjectsWithThisUserAsContact').' '; +$tmptitle = $langs->trans('ProjectsWithThisUserAsContact'); $includeonly = ''; if (empty($user->rights->user->user->lire)) { $includeonly = array($user->id); } -$moreforfilter .= $form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200'); +$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', $tmptitle, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth250'); $moreforfilter .= '
'; // If the user can view users $moreforfilter .= '
'; -$moreforfilter .= $langs->trans('TasksWithThisUserAsContact').': '; +$tmptitle = $langs->trans('TasksWithThisUserAsContact'); $includeonly = ''; if (empty($user->rights->user->user->lire)) { $includeonly = array($user->id); } -$moreforfilter .= $form->select_dolusers($search_task_user, 'search_task_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200'); +$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_task_user, 'search_task_user', $tmptitle, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth250'); $moreforfilter .= '
'; if (!empty($moreforfilter)) { @@ -658,7 +658,7 @@ if (!empty($arrayfields['t.dateo']['checked'])) { print ''; } print ''; - $formother->select_year($search_syear ? $search_syear : -1, 'search_syear', 1, 20, 5); + print $formother->selectyear($search_syear ? $search_syear : -1, 'search_syear', 1, 20, 5, 0, 0, '', 'valignmiddle width75', 1); print ''; } // End date @@ -668,7 +668,7 @@ if (!empty($arrayfields['t.datee']['checked'])) { print ''; } print ''; - $formother->select_year($search_eyear ? $search_eyear : -1, 'search_eyear', 1, 20, 5); + print $formother->selectyear($search_eyear ? $search_eyear : -1, 'search_eyear', 1, 20, 5, 0, 0, '', 'valignmiddle width75', 1); print ''; } if (!empty($arrayfields['p.ref']['checked'])) { diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php index b192fa14011..e6c1ef9b97c 100644 --- a/htdocs/salaries/list.php +++ b/htdocs/salaries/list.php @@ -602,7 +602,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) { // if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield'; // Amount - print ''.price($obj->amount).''; + print ''.price($obj->amount).''; if (!$i) { $totalarray['nbfield']++; } diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index f60f20f7f7a..71540aa2f11 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -560,24 +560,24 @@ if ($resql) { if ($user->rights->societe->client->voir || $socid) { $langs->load("commercial"); $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': '; - $moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300'); + $tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250'); $moreforfilter .= '
'; } // If the user can view prospects other than his' if ($user->rights->societe->client->voir || $socid) { $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('LinkedToSpecificUsers').': '; - $moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); + $tmptitle = $langs->trans('LinkedToSpecificUsers'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250'); $moreforfilter .= '
'; } // If the user can view products if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) { include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('IncludingProductWithTag').': '; + $tmptitle = $langs->trans('IncludingProductWithTag'); $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1); - $moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); $moreforfilter .= '
'; } $parameters = array();