diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 778c141ed18..1e21952c2d1 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -1171,7 +1171,7 @@ if ($action == 'create') if ($flag_price_may_change) { - print ''; + print ''; print ''; print ''; } // Thirpdarty if (! empty($arrayfields['s.nom']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['f.total']['checked'])) { // Amount net - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['f.tva']['checked'])) { // Amount Vat - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['f.total_ttc']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['f.fk_cond_reglement']['checked'])) { // Payment term - print ''; + print ''; print $form->select_conditions_paiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100'); print ""; } if (! empty($arrayfields['f.fk_mode_reglement']['checked'])) { // Payment mode - print ''; + print ''; print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100'); print ''; } @@ -479,12 +479,12 @@ if ($resql) print ''; if (! empty($arrayfields['f.titre']['checked'])) print_liste_field_titre($arrayfields['f.titre']['label'], $_SERVER['PHP_SELF'], "f.titre", "", $param, "", $sortfield, $sortorder); if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], "s.nom", "", $param, "", $sortfield, $sortorder); - if (! empty($arrayfields['f.total']['checked'])) print_liste_field_titre($arrayfields['f.total']['label'], $_SERVER['PHP_SELF'], "f.total", "", $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['f.tva']['checked'])) print_liste_field_titre($arrayfields['f.tva']['label'], $_SERVER['PHP_SELF'], "f.tva", "", $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['f.total_ttc']['checked'])) print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], "f.total_ttc", "", $param, 'align="right"', $sortfield, $sortorder); + if (! empty($arrayfields['f.total']['checked'])) print_liste_field_titre($arrayfields['f.total']['label'], $_SERVER['PHP_SELF'], "f.total", "", $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['f.tva']['checked'])) print_liste_field_titre($arrayfields['f.tva']['label'], $_SERVER['PHP_SELF'], "f.tva", "", $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['f.total_ttc']['checked'])) print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder); if (! empty($arrayfields['f.fk_cond_reglement']['checked'])) print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_cond_reglement", "", $param, '', $sortfield, $sortorder); if (! empty($arrayfields['f.fk_mode_reglement']['checked'])) print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_mode_reglement", "", $param, '', $sortfield, $sortorder); - if (! empty($arrayfields['recurring']['checked'])) print_liste_field_titre($arrayfields['recurring']['label'], $_SERVER['PHP_SELF'], "recurring", "", $param, 'align="center"', $sortfield, $sortorder); + if (! empty($arrayfields['recurring']['checked'])) print_liste_field_titre($arrayfields['recurring']['label'], $_SERVER['PHP_SELF'], "recurring", "", $param, 'class="center"', $sortfield, $sortorder); if (! empty($arrayfields['f.frequency']['checked'])) print_liste_field_titre($arrayfields['f.frequency']['label'], $_SERVER['PHP_SELF'], "f.frequency", "", $param, 'align="center"', $sortfield, $sortorder); if (! empty($arrayfields['f.unit_frequency']['checked'])) print_liste_field_titre($arrayfields['f.unit_frequency']['label'], $_SERVER['PHP_SELF'], "f.unit_frequency", "", $param, 'align="center"', $sortfield, $sortorder); if (! empty($arrayfields['f.nb_gen_done']['checked'])) print_liste_field_titre($arrayfields['f.nb_gen_done']['label'], $_SERVER['PHP_SELF'], "f.nb_gen_done", "", $param, 'align="center"', $sortfield, $sortorder); @@ -533,21 +533,21 @@ if ($resql) } if (! empty($arrayfields['f.total']['checked'])) { - print ''.price($objp->total).''."\n"; + print ''.price($objp->total).''."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total'; $totalarray['val']['f.total'] += $objp->total; } if (! empty($arrayfields['f.tva']['checked'])) { - print ''.price($objp->total_vat).''."\n"; + print ''.price($objp->total_vat).''."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.tva'; $totalarray['val']['f.tva'] += $objp->total_vat; } if (! empty($arrayfields['f.total_ttc']['checked'])) { - print ''.price($objp->total_ttc).''."\n"; + print ''.price($objp->total_ttc).''."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total_ttc'; $totalarray['val']['f.total_ttc'] += $objp->total_ttc; @@ -555,7 +555,7 @@ if ($resql) // Payment term if (! empty($arrayfields['f.fk_cond_reglement']['checked'])) { - print ''; + print ''; print $form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none'); print ''."\n"; if (! $i) $totalarray['nbfield']++; @@ -563,7 +563,7 @@ if ($resql) // Payment mode if (! empty($arrayfields['f.fk_mode_reglement']['checked'])) { - print ''; + print ''; print $form->form_modes_reglement('', $objp->fk_mode_reglement, 'none'); print ''."\n"; if (! $i) $totalarray['nbfield']++; @@ -683,7 +683,7 @@ if ($resql) while ($i < $totalarray['nbfield']) { $i++; - if (! empty($totalarray['pos'][$i])) print ''.price($totalarray['val'][$totalarray['pos'][$i]]).''; + if (! empty($totalarray['pos'][$i])) print ''.price($totalarray['val'][$totalarray['pos'][$i]]).''; else { if ($i == 1) diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 0ec1cda8e10..3363caddeef 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -779,46 +779,46 @@ if ($resql) if (! empty($arrayfields['f.total_ht']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['f.total_vat']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['f.total_localtax1']['checked'])) { // Localtax1 - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['f.total_localtax2']['checked'])) { // Localtax2 - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['f.total_ttc']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['dynamount_payed']['checked'])) { - print ''; + print ''; print ''; } if (! empty($arrayfields['rtp']['checked'])) { - print ''; + print ''; print ''; } // Extra fields @@ -843,7 +843,7 @@ if ($resql) // Status if (! empty($arrayfields['f.fk_statut']['checked'])) { - print ''; + print ''; $liststatus=array('0'=>$langs->trans("BillShortStatusDraft"), '1'=>$langs->trans("BillShortStatusNotPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '1,2'=>$langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled")); print $form->selectarray('search_status', $liststatus, $search_status, 1); print ''; @@ -869,13 +869,13 @@ if ($resql) 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['f.fk_mode_reglement']['checked'])) print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder); - if (! empty($arrayfields['f.total_ht']['checked'])) print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['f.total_vat']['checked'])) print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['f.total_localtax1']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['f.total_localtax2']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['f.total_ttc']['checked'])) print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['dynamount_payed']['checked'])) print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['rtp']['checked'])) print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder); + if (! empty($arrayfields['f.total_ht']['checked'])) print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['f.total_vat']['checked'])) print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['f.total_localtax1']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['f.total_localtax2']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['f.total_ttc']['checked'])) print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['dynamount_payed']['checked'])) print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['rtp']['checked'])) print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder); // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; // Hook fields @@ -884,7 +884,7 @@ if ($resql) print $hookmanager->resPrint; if (! empty($arrayfields['f.datec']['checked'])) print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); if (! empty($arrayfields['f.tms']['checked'])) print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); - if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut,f.paye,f.type,dynamount_payed", "", $param, 'align="right"', $sortfield, $sortorder); + if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut,f.paye,f.type,dynamount_payed", "", $param, 'class="right"', $sortfield, $sortorder); print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); print "\n"; @@ -1084,7 +1084,7 @@ if ($resql) // Amount HT if (! empty($arrayfields['f.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; @@ -1092,7 +1092,7 @@ if ($resql) // Amount VAT if (! empty($arrayfields['f.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; @@ -1100,7 +1100,7 @@ if ($resql) // Amount LocalTax1 if (! empty($arrayfields['f.total_localtax1']['checked'])) { - print ''.price($obj->total_localtax1)."\n"; + print ''.price($obj->total_localtax1)."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totallocaltax1field']=$totalarray['nbfield']; $totalarray['totallocaltax1'] += $obj->total_localtax1; @@ -1108,7 +1108,7 @@ if ($resql) // Amount LocalTax2 if (! empty($arrayfields['f.total_localtax2']['checked'])) { - print ''.price($obj->total_localtax2)."\n"; + print ''.price($obj->total_localtax2)."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totallocaltax2field']=$totalarray['nbfield']; $totalarray['totallocaltax2'] += $obj->total_localtax2; @@ -1116,7 +1116,7 @@ if ($resql) // Amount TTC if (! empty($arrayfields['f.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; @@ -1124,7 +1124,7 @@ if ($resql) if (! empty($arrayfields['dynamount_payed']['checked'])) { - print ''.(! empty($totalpay)?price($totalpay, 0, $langs):' ').''; // TODO Use a denormalized field + print ''.(! empty($totalpay)?price($totalpay, 0, $langs):' ').''; // TODO Use a denormalized field if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalamfield']=$totalarray['nbfield']; $totalarray['totalam'] += $totalpay; @@ -1132,7 +1132,7 @@ if ($resql) if (! empty($arrayfields['rtp']['checked'])) { - print ''.(! empty($remaintopay)?price($remaintopay, 0, $langs):' ').''; // TODO Use a denormalized field + print ''.(! empty($remaintopay)?price($remaintopay, 0, $langs):' ').''; // TODO Use a denormalized field if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalrtpfield']=$totalarray['nbfield']; $totalarray['totalrtp'] += $remaintopay; @@ -1163,7 +1163,7 @@ if ($resql) // Status if (! empty($arrayfields['f.fk_statut']['checked'])) { - print ''; + print ''; print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $paiement, $obj->type); print ""; if (! $i) $totalarray['nbfield']++; @@ -1205,13 +1205,13 @@ 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['totallocaltax1field'] == $i) print ''.price($totalarray['totallocaltax1']).''; - elseif ($totalarray['totallocaltax2field'] == $i) print ''.price($totalarray['totallocaltax2']).''; - elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).''; - elseif ($totalarray['totalamfield'] == $i) print ''.price($totalarray['totalam']).''; - elseif ($totalarray['totalrtpfield'] == $i) print ''.price($totalarray['totalrtp']).''; + elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).''; + elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).''; + elseif ($totalarray['totallocaltax1field'] == $i) print ''.price($totalarray['totallocaltax1']).''; + elseif ($totalarray['totallocaltax2field'] == $i) print ''.price($totalarray['totallocaltax2']).''; + elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).''; + elseif ($totalarray['totalamfield'] == $i) print ''.price($totalarray['totalam']).''; + elseif ($totalarray['totalrtpfield'] == $i) print ''.price($totalarray['totalrtp']).''; else print ''; } print ''; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 9471df8655f..ccc3b305447 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -274,7 +274,7 @@ if ($object->id > 0) print ''; - if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; + if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; print '
'; print $langs->trans('DateInvoice'); print 'id.'">'.img_edit($langs->trans('SetDate'), 1).'id.'">'.img_edit($langs->trans('SetDate'), 1).'
'; print ''; @@ -301,7 +301,7 @@ if ($object->id > 0) print ''; - if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; + if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; print '
'; print $langs->trans('PaymentConditionsShort'); print 'id.'">'.img_edit($langs->trans('SetConditions'), 1).'id.'">'.img_edit($langs->trans('SetConditions'), 1).'
'; print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE) @@ -326,7 +326,7 @@ if ($object->id > 0) print ''; - if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; + if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; print '
'; print $langs->trans('DateMaxPayment'); print 'id.'">'.img_edit($langs->trans('SetDate'), 1).'id.'">'.img_edit($langs->trans('SetDate'), 1).'
'; print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE) @@ -354,7 +354,7 @@ if ($object->id > 0) print ''; - if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; + if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; print '
'; print $langs->trans('PaymentMode'); print 'id.'">'.img_edit($langs->trans('SetMode'), 1).'id.'">'.img_edit($langs->trans('SetMode'), 1).'
'; print ''; if ($action == 'editmode') @@ -373,7 +373,7 @@ if ($object->id > 0) print $langs->trans('BankAccount'); print ''; if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon)) - print 'id.'">'.img_edit($langs->trans('SetBankAccount'), 1).''; + print 'id.'">'.img_edit($langs->trans('SetBankAccount'), 1).''; print ''; print ''; if ($action == 'editbankaccount') @@ -447,7 +447,7 @@ if ($object->id > 0) print ''; if ($action != 'editrevenuestamp' && ! empty($object->brouillon) && $user->rights->facture->creer) { - print 'id . '">' . img_edit($langs->trans('SetRevenuStamp'), 1) . ''; + print 'id . '">' . img_edit($langs->trans('SetRevenuStamp'), 1) . ''; } print ''; print ''; @@ -615,7 +615,7 @@ if ($object->id > 0) print ''.$langs->trans("OrderWaiting").''; - print ''; + print ''; print ''; print img_delete(); print ''; diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 687c31de036..db69324d5e5 100644 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -182,7 +182,7 @@ print ""; print "".$langs->trans("Date").""; print "".$langs->trans("Piece").' ('.$langs->trans("InvoiceRef").")"; print "".$langs->trans("Account").""; -print "".$langs->trans("Type")."".$langs->trans("Debit")."".$langs->trans("Credit").""; +print "".$langs->trans("Type")."".$langs->trans("Debit")."".$langs->trans("Credit").""; print "\n"; @@ -236,13 +236,13 @@ foreach ($tabfac as $key => $val) if (isset($line['inv'])) { - print ''.($mt<0?price(-$mt):'').""; - print ''.($mt>=0?price($mt):'').""; + print ''.($mt<0?price(-$mt):'').""; + print ''.($mt>=0?price($mt):'').""; } else { - print ''.($mt>=0?price($mt):'').""; - print ''.($mt<0?price(-$mt):'').""; + print ''.($mt>=0?price($mt):'').""; + print ''.($mt<0?price(-$mt):'').""; } print ""; diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index fcd53a58ea3..ea5f54639a1 100644 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -211,7 +211,7 @@ print ''; //print "".$langs->trans("JournalNum").""; print ''.$langs->trans('Date').''.$langs->trans('Piece').' ('.$langs->trans('InvoiceRef').')'; print ''.$langs->trans('Account').''; -print ''.$langs->trans('Type').''.$langs->trans('Debit').''.$langs->trans('Credit').''; +print ''.$langs->trans('Type').''.$langs->trans('Debit').''.$langs->trans('Credit').''; print "\n"; @@ -266,13 +266,13 @@ foreach ($tabfac as $key => $val) if (isset($line['inv'])) { - print ''.($mt>=0?price($mt):'').""; - print ''.($mt<0?price(-$mt):'').""; + print ''.($mt>=0?price($mt):'').""; + print ''.($mt<0?price(-$mt):'').""; } else { - print ''.($mt<0?price(-$mt):'').""; - print ''.($mt>=0?price($mt):'').""; + print ''.($mt<0?price(-$mt):'').""; + print ''.($mt>=0?price($mt):'').""; } print ""; diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index 8c6bdb0717b..58b1ccd3f21 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -157,13 +157,13 @@ $vatsup=$langs->transcountry($local==1?"LT1":"LT2", $mysoc->country_code); // IRPF that the customer has retained me if($calc ==0 || $calc == 2) { - print ""; - print ""; - print '"; - print '"; - print ""; - print ""; - print ""; + print '
'.$langs->trans("Num")."'.$langs->trans("Customer")."".$langs->transcountry("ProfId1", $mysoc->country_code)."".$langs->trans("TotalHT")."".$vatcust."
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print "\n"; $coll_list = tax_by_thirdparty('localtax'.$local, $db, 0, $date_start, $date_end, $modetax, 'sell'); @@ -208,9 +208,9 @@ if($calc ==0 || $calc == 2) print ''; $find = array(' ','.'); $replace = array('',''); - print '"; - print ""; - print ""; + print ''; + print ''; + print ''; $totalamount = $totalamount + $coll->amount; $total = $total + ($local==1?$coll->localtax1:$coll->localtax2); print "\n"; @@ -219,9 +219,9 @@ if($calc ==0 || $calc == 2) } $x_coll_sum = $total; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; } else @@ -238,13 +238,13 @@ if($calc ==0 || $calc == 2) // IRPF I retained my supplier if($calc ==0 || $calc == 1){ - print "
'.$langs->trans("Num").''.$langs->trans("Customer").''.$langs->transcountry("ProfId1", $mysoc->country_code).''.$langs->trans("TotalHT").''.$vatcust.'
'.$company_static->getNomUrl(1).''.$intra."".price($coll->amount)."".price($local==1?$coll->localtax1:$coll->localtax2)."'.$intra.''.price($coll->amount).''.price($local==1?$coll->localtax1:$coll->localtax2).'
'.$langs->trans("Total").':'.price($totalamount).''.price($total).'
'.$langs->trans("Total").':'.price($totalamount).''.price($total).'
"; - print ""; + print '
'; + print ''; print '"; print '"; - print ""; - print ""; - print ""; + print ''; + print ''; + print ''; print "\n"; $company_static=new Societe($db); @@ -283,8 +283,8 @@ if($calc ==0 || $calc == 1){ $find = array(' ','.'); $replace = array('',''); print '"; - print ""; - print ""; + print ''; + print ''; $totalamount = $totalamount + $coll->amount; $total = $total + ($local==1?$coll->localtax1:$coll->localtax2); print "\n"; @@ -293,9 +293,9 @@ if($calc ==0 || $calc == 1){ } $x_paye_sum = $total; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print '
'.$langs->trans("Num")."'.$langs->trans("Supplier")."".$langs->transcountry("ProfId1", $mysoc->country_code)."".$langs->trans("TotalHT")."".$vatsup."'.$langs->transcountry("ProfId1", $mysoc->country_code).''.$langs->trans("TotalHT").''.$vatsup.'
'.$intra."".price($coll->amount)."".price($local==1?$coll->localtax1:$coll->localtax2)."'.price($coll->amount).''.price($local==1?$coll->localtax1:$coll->localtax2).'
'.$langs->trans("Total").':'.price($totalamount).''.price($total).'
'.$langs->trans("Total").':'.price($totalamount).''.price($total).'
'; @@ -319,7 +319,7 @@ if($calc ==0){ $diff = $x_coll_sum - $x_paye_sum ; print ''; print ''.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').''; - print ''.price(price2num($diff, 'MT'))."\n"; + print ''.price(price2num($diff, 'MT'))."\n"; print "\n"; } print ''; diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index 403737ce083..8d288274049 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -101,8 +101,8 @@ function pt($db, $sql, $date) print ''; print ''.$date.''; - print ''.$langs->trans("ClaimedForThisPeriod").''; - print ''.$langs->trans("PaidDuringThisPeriod").''; + print ''.$langs->trans("ClaimedForThisPeriod").''; + print ''.$langs->trans("PaidDuringThisPeriod").''; print "\n"; $totalclaimed = 0; @@ -122,8 +122,8 @@ function pt($db, $sql, $date) { print ''; print ''.$previousmonth."\n"; - print ''.price($amountclaimed)."\n"; - print ''.price($amountpaid)."\n"; + print ''.price($amountclaimed)."\n"; + print ''.price($amountpaid)."\n"; print "\n"; $amountclaimed = 0; @@ -145,8 +145,8 @@ function pt($db, $sql, $date) { print ''; print ''.$obj->dm."\n"; - print ''.price($amountclaimed)."\n"; - print ''.price($amountpaid)."\n"; + print ''.price($amountclaimed)."\n"; + print ''.price($amountpaid)."\n"; print "\n"; $amountclaimed = 0; $amountpaid = 0; @@ -166,8 +166,8 @@ function pt($db, $sql, $date) { print ''; print ''.$previousmonth."\n"; - print ''.price($amountclaimed)."\n"; - print ''.price($amountpaid)."\n"; + print ''.price($amountclaimed)."\n"; + print ''.price($amountpaid)."\n"; print "\n"; $amountclaimed = 0; @@ -175,9 +175,9 @@ function pt($db, $sql, $date) } print ''; - print ''.$langs->trans("Total").''; - print ''.price($totalclaimed).''; - print ''.price($totalpaid).''; + print ''.$langs->trans("Total").''; + print ''.price($totalclaimed).''; + print ''.price($totalpaid).''; print ""; print ""; @@ -249,16 +249,16 @@ print ''; print ''; print '"; if($CalcLT==0) { - print ""; - print ""; + print ''; + print ''; } if($CalcLT==1) { - print ""; + print ''; } if($CalcLT==2) { - print ""; + print ''; } -print ""; +print ''; print "\n"; print "\n"; @@ -475,7 +475,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc $x_coll_sum += $temp_vat; } } - print ""; + print ''; $x_paye_sum = 0; foreach (array_keys($x_paye) as $rate) @@ -519,7 +519,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc $x_paye_sum += $temp_vat; } } - print ""; + print ''; $subtotalcoll = $subtotalcoll + $x_coll_sum; $subtotalpaye = $subtotalpaye + $x_paye_sum; @@ -528,7 +528,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc $total = $total + $diff; $subtotal = price2num($subtotal + $diff, 'MT'); - print "\n"; + print '\n'; print "\n"; print "\n"; @@ -536,16 +536,16 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc if ($i > 2) { print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print ''; $i = 0; $subtotalcoll=0; $subtotalpaye=0; $subtotal=0; } } -print ''; +print ''; print "\n"; print ''; diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php index 7efee5995ff..8d02d8390dd 100644 --- a/htdocs/compta/localtax/list.php +++ b/htdocs/compta/localtax/list.php @@ -93,7 +93,7 @@ if ($result) $i++; } print ''; - print ''; + print ''; print "
'.$langs->trans("Year")." ".$y."".$langs->transcountry($LTCustomer, $mysoc->country_code)."".$langs->transcountry($LTSupplier, $mysoc->country_code)."'.$langs->transcountry($LTCustomer, $mysoc->country_code).''.$langs->transcountry($LTSupplier, $mysoc->country_code).'".$langs->transcountry($LTSupplier, $mysoc->country_code)."'.$langs->transcountry($LTSupplier, $mysoc->country_code).'".$langs->transcountry($LTCustomer, $mysoc->country_code)."'.$langs->transcountry($LTCustomer, $mysoc->country_code).'".$langs->trans("TotalToPay")."'.$langs->trans("TotalToPay").' 
".price(price2num($x_coll_sum, 'MT'))."'.price(price2num($x_coll_sum, 'MT')).'".price(price2num($x_paye_sum, 'MT'))."'.price(price2num($x_paye_sum, 'MT')).'".price(price2num($diff, 'MT'))."'.price(price2num($diff, 'MT')).' 
'.$langs->trans("SubTotal").':'.price(price2num($subtotalcoll, 'MT')).''.price(price2num($subtotalpaye, 'MT')).''.price(price2num($subtotal, 'MT')).''.$langs->trans("SubTotal").':'.price(price2num($subtotalcoll, 'MT')).''.price(price2num($subtotalpaye, 'MT')).''.price(price2num($subtotal, 'MT')).' 
'.$langs->trans("TotalToPay").':'.price(price2num($total, 'MT')).'
'.$langs->trans("TotalToPay").':'.price(price2num($total, 'MT')).' 
'.$langs->trans("Total").''.price($total).'
'.price($total).'
"; $db->free($result); diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php index 07fd53ffbad..4bbe5c723e1 100644 --- a/htdocs/compta/localtax/quadri_detail.php +++ b/htdocs/compta/localtax/quadri_detail.php @@ -320,10 +320,10 @@ else print ''; print ''.$elementcust.''; print ''.$productcust.''; - if ($modetax != 2) print ''.$amountcust.''; - if ($modetax != 1) print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'; - print ''.$langs->trans("BI").''; - print ''.$vatcust.''; + if ($modetax != 2) print ''.$amountcust.''; + if ($modetax != 1) print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'; + print ''.$langs->trans("BI").''; + print ''.$vatcust.''; print ''; @@ -357,7 +357,7 @@ else print ''; // Ref - print ''.$fields['link'].''; + print ''.$fields['link'].''; // Description print ''; @@ -389,7 +389,7 @@ else // Total HT if ($modetax != 2) { - print ''; + print ''; print price($fields['totalht']); if (price2num($fields['ftotal_ttc'])) { @@ -403,7 +403,7 @@ else if ($modetax != 1) { if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']); - print ''; + print ''; if ($fields['payment_amount'] && $fields['ftotal_ttc']) { $payment_static->id=$fields['payment_id']; @@ -421,14 +421,14 @@ else } // Total collected - print ''; + print ''; $temp_ht=$fields['totalht']; if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice; print price(price2num($temp_ht, 'MT')); print ''; // Localtax - print ''; + print ''; $temp_vat= $local==1?$fields['localtax1']:$fields['localtax2']; print price(price2num($temp_vat, 'MT')); //print price($fields['vat']); @@ -445,14 +445,14 @@ else // Total customers for this vat rate print ''; print ''; - print ''.$langs->trans("Total").':'; + print ''.$langs->trans("Total").':'; if ($modetax != 1) { - print ' '; - print ' '; + 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 ''; } @@ -460,14 +460,14 @@ else { print ''; print ' '; - print ''.$langs->trans("Total").':'; + print ''.$langs->trans("Total").':'; if ($modetax == 0) { - print ' '; - print ' '; + print ' '; + print ' '; } - print ''.price(price2num(0, 'MT')).''; - print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; print ''; } @@ -485,11 +485,11 @@ else print ''.$productsup.''; if ($modetax != 1) { - print ''.$amountsup.''; - print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'; + print ''.$amountsup.''; + print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'; } - print ''.$langs->trans("BI").''; - print ''.$vatsup.''; + print ''.$langs->trans("BI").''; + print ''.$vatsup.''; print ''."\n"; foreach(array_keys($x_paye) as $rate) @@ -519,7 +519,7 @@ else print ''; // Ref - print ''.$fields['link'].''; + print ''.$fields['link'].''; // Description print ''; @@ -545,7 +545,7 @@ else // Total HT if ($modetax != 2) { - print ''; + print ''; print price($fields['totalht']); if (price2num($fields['ftotal_ttc'])) { @@ -560,7 +560,7 @@ else $ratiopaymentinvoice=1; if ($modetax != 1) { - print ''; + print ''; if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']); if ($fields['payment_amount'] && $fields['ftotal_ttc']) { @@ -582,13 +582,13 @@ else } // VAT paid - print ''; + print ''; $temp_ht=$fields['totalht']*$ratiopaymentinvoice; print price(price2num($temp_ht, 'MT'), 1); print ''; // Localtax - print ''; + print ''; $temp_vat=($local==1?$fields['localtax1']:$fields['localtax2'])*$ratiopaymentinvoice; print price(price2num($temp_vat, 'MT'), 1); //print price($fields['vat']); @@ -605,27 +605,27 @@ else // Total suppliers for this vat rate print ''; print ' '; - print ''.$langs->trans("Total").':'; + print ''.$langs->trans("Total").':'; if ($modetax != 1) { - print ' '; - print ' '; + 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 ''; } if (count($x_paye) == 0) { // Show a total line if nothing shown print ''; print ' '; - print ''.$langs->trans("Total").':'; + print ''.$langs->trans("Total").':'; if ($modetax != 1) { - print ' '; - print ' '; + print ' '; + print ' '; } - print ''.price(price2num(0, 'MT')).''; - print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; print ''; } @@ -638,7 +638,7 @@ else $diff = $x_coll_sum - $x_paye_sum; print ''; print ''.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').''; - print ''.price(price2num($diff, 'MT'))."\n"; + print ''.price(price2num($diff, 'MT'))."\n"; print "\n"; $i++; diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index e8fda32f820..4c0effee111 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -343,10 +343,10 @@ if ($resql) print ''.$langs->trans('Bill').''; print ''.$langs->trans('Company').''; if($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED )print ''.$langs->trans('Entity').''; - print ''.$langs->trans('ExpectedToPay').''; - print ''.$langs->trans('PayedByThisPayment').''; - print ''.$langs->trans('RemainderToPay').''; - print ''.$langs->trans('Status').''; + print ''.$langs->trans('ExpectedToPay').''; + print ''.$langs->trans('PayedByThisPayment').''; + print ''.$langs->trans('RemainderToPay').''; + print ''.$langs->trans('Status').''; print "\n"; if ($num > 0) @@ -386,16 +386,16 @@ 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).''; + print ''.$invoice->getLibStatut(5, $alreadypayed).''; print "\n"; if ($objp->paye == 1) // If at least one invoice is paid, disable delete diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index e52a1135ba0..ee69d8d89f3 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -476,7 +476,7 @@ if ($action == 'new') print ''.$langs->trans("ChequeNumber")."\n"; print ''.$langs->trans("CheckTransmitter")."\n"; print ''.$langs->trans("Bank")."\n"; - print ''.$langs->trans("Amount")."\n"; + print ''.$langs->trans("Amount")."\n"; print ''.$langs->trans("Payment")."\n"; print ''.$langs->trans("LineRecord")."\n"; print ''.$langs->trans("Select")."
"; @@ -500,7 +500,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 ''; @@ -576,7 +576,7 @@ else print ''; - if ($action != 'editdate') print ''; + if ($action != 'editdate') print ''; print '
'; print $langs->trans('Date'); print 'id.'">'.img_edit($langs->trans('SetDate'), 1).'id.'">'.img_edit($langs->trans('SetDate'), 1).'
'; print ''; if ($action == 'editdate') @@ -603,7 +603,7 @@ else print ''; - if ($action != 'editrefext') print ''; + if ($action != 'editrefext') print ''; print '
'; print $langs->trans('RefExt'); print 'id.'">'.img_edit($langs->trans('SetRefExt'),1).'id.'">'.img_edit($langs->trans('SetRefExt'),1).'
'; print ''; if ($action == 'editrefext') @@ -674,7 +674,7 @@ else print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "b.num_chq", "", $param, 'align="center"', $sortfield, $sortorder); print_liste_field_titre("CheckTransmitter", $_SERVER["PHP_SELF"], "b.emetteur", "", $param, "", $sortfield, $sortorder); print_liste_field_titre("Bank", $_SERVER["PHP_SELF"], "b.banque", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "b.amount", "", $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "b.amount", "", $param, 'class="right"', $sortfield, $sortorder); print_liste_field_titre("Payment", $_SERVER["PHP_SELF"], "p.rowid", "", $param, 'align="center"', $sortfield, $sortorder); print_liste_field_titre("LineRecord", $_SERVER["PHP_SELF"], "b.rowid", "", $param, 'align="center"', $sortfield, $sortorder); print_liste_field_titre(''); @@ -698,7 +698,7 @@ else 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; @@ -725,7 +725,7 @@ else } print ''; // Action button - print ''; + print ''; if ($object->statut == 0) { print 'rowid.'">'.img_delete().''; diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index a9131c986bb..fb3606880ab 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -72,7 +72,7 @@ if ($resql) { } print ''; print ''.$langs->trans("BankChecksToReceipt").''; - print ''; + print ''; print ''.$num.''; print ''; print "\n"; @@ -106,9 +106,9 @@ if ($resql) print ''.$langs->trans("LastCheckReceiptShort", $max).''; print ''.$langs->trans("Date").""; print ''.$langs->trans("Account").''; - print ''.$langs->trans("NbOfCheques").''; - print ''.$langs->trans("Amount").''; - print ''.$langs->trans("Status").''; + print ''.$langs->trans("NbOfCheques").''; + print ''.$langs->trans("Amount").''; + print ''.$langs->trans("Status").''; print "\n"; while ( $objp = $db->fetch_object($resql) ) @@ -131,9 +131,9 @@ if ($resql) print ''.$checkdepositstatic->getNomUrl(1).''; print ''.dol_print_date($db->jdate($objp->db), 'day').''; print ''.$accountstatic->getNomUrl(1).''; - print ''.$objp->nbcheque.''; - print ''.price($objp->amount).''; - print ''.$checkdepositstatic->LibStatut($objp->statut, 3).''; + print ''.$objp->nbcheque.''; + 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 1c0736e5cc9..6e86ecf14b6 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -173,11 +173,11 @@ if ($resql) $form->select_comptes($search_account, 'search_account', 0, '', 1); print ''; print ' '; - print ''; + print ''; print ''; print ''; print ''; - print ''; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print ''; @@ -187,9 +187,9 @@ if ($resql) print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "bc.ref", "", $param, "", $sortfield, $sortorder); print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "dp", "", $param, 'align="center"', $sortfield, $sortorder); print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre("NbOfCheques", $_SERVER["PHP_SELF"], "bc.nbcheque", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "bc.amount", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "bc.statut", "", $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("NbOfCheques", $_SERVER["PHP_SELF"], "bc.nbcheque", "", $param, 'class="right"', $sortfield, $sortorder); + print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "bc.amount", "", $param, 'class="right"', $sortfield, $sortorder); + print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "bc.statut", "", $param, 'class="right"', $sortfield, $sortorder); print_liste_field_titre(''); print "\n"; @@ -219,13 +219,13 @@ if ($resql) print ''; // Number of cheques - print ''.$objp->nbcheque.''; + print ''.$objp->nbcheque.''; // Amount - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; // Statut - print ''; + print ''; print $checkdepositstatic->LibStatut($objp->statut, 5); print ''; diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index 1f0b26a5563..5e555655228 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -225,7 +225,7 @@ if ($resql) // Lines for filters fields print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -248,16 +248,16 @@ if ($resql) $form->select_comptes($search_account, 'search_account', 0, '', 1); print ''; } - print ''; + print ''; print ''; print ''; - print ''; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print ''; if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) { - print ''; + print ''; print ''; } print "\n"; @@ -272,8 +272,8 @@ if ($resql) { print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder); } - print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, 'align="right"', $sortfield, $sortorder); - //print_liste_field_titre("Invoices"),"","","",$param,'align="left"',$sortfield,$sortorder); + print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, 'class="right"', $sortfield, $sortorder); + //print_liste_field_titre("Invoices"),"","","",$param,'class="left"',$sortfield,$sortorder); $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 @@ -342,11 +342,11 @@ if ($resql) print ''; } // Amount - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) { - print ''; + print ''; if ($objp->statut == 0) print ''; print $paymentstatic->LibStatut($objp->statut, 5); if ($objp->statut == 0) print ''; diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index fe14241ee54..ebeb9012733 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -142,8 +142,8 @@ if ($year) print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; if (is_resource($handle)) @@ -156,8 +156,8 @@ if ($year) $tfile = $dir . '/'.$year.'/'.$file; $relativepath = $year.'/'.$file; print ''.''; - print ''; - print ''; + print ''; + print ''; } } closedir($handle); diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php index 6515ec35fc4..0e2889814cc 100644 --- a/htdocs/compta/paiement/tovalidate.php +++ b/htdocs/compta/paiement/tovalidate.php @@ -108,7 +108,7 @@ if ($resql) print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", "", 'width="60"', $sortfield, $sortorder); print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "dp", "", "", 'width="80" align="center"', $sortfield, $sortorder); print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "c.libelle", "", "", "", $sortfield, $sortorder); - print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "c.libelle", "", "", 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "c.libelle", "", "", 'class="right"', $sortfield, $sortorder); print_liste_field_titre(''); print "\n"; @@ -120,7 +120,7 @@ if ($resql) print ''; print '\n"; print "\n"; - print ''; + print ''; print ''; print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print "\n"; if ($num > 0) @@ -265,11 +265,11 @@ if ($resql) // Label print ''; // Expected to pay - print ''; + print ''; // Status print ''; // Amount payed - print ''; + print ''; print "\n"; if ($objp->paye == 1) // If at least one invoice is paid, disable delete { diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 3d2e2ef94f0..fcd48a6a305 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -136,7 +136,7 @@ if ($result) print ''; print ''; print ''; - print ''; @@ -145,8 +145,8 @@ if ($result) print ''; print_liste_field_titre("WithdrawalsReceipts", $_SERVER["PHP_SELF"], "p.ref", '', '', 'class="liste_titre"', $sortfield, $sortorder); print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", "", 'class="liste_titre" align="center"', $sortfield, $sortorder); - print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", "", 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", "", 'class="right"', $sortfield, $sortorder); + print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'class="right"', $sortfield, $sortorder); print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n"; print "\n"; @@ -160,13 +160,13 @@ if ($result) print '\n"; - print '\n"; + print '\n"; - print ''; - print ''."\n"; + print ''."\n"; print "\n"; $i++; diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index 0a66c18a607..d31efcc9df8 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -344,7 +344,7 @@ if ($id > 0 || $ref) print ''; print_liste_field_titre("Lines", $_SERVER["PHP_SELF"], "pl.rowid", '', $urladd); print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $urladd); - print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", $urladd, 'align="right"'); + print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", $urladd, 'class="right"'); print_liste_field_titre(''); print "\n"; @@ -372,7 +372,7 @@ if ($id > 0 || $ref) print $thirdparty->getNomUrl(1); print "\n"; - print '\n"; + print '\n"; print ''; print ''; print ''; - print '\n"; diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index c3a4fa8556d..d9298c9f607 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -234,8 +234,8 @@ if ($resql) print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; if ($num) @@ -271,11 +271,11 @@ if ($resql) if ($format) print ' ('.$format.')'; print ''; // Amount - print ''; // Date - print ''; print ''; @@ -317,7 +317,7 @@ if ($result) print"\n\n"; print '
'.$langs->trans("Reporting").''.$langs->trans("Size").''.$langs->trans("Date").''.$langs->trans("Size").''.$langs->trans("Date").'
'.img_pdf().' '.$file.''.dol_print_size(dol_filesize($tfile)).''.dol_print_date(dol_filemtime($tfile), "dayhour").'
'.dol_print_size(dol_filesize($tfile)).''.dol_print_date(dol_filemtime($tfile), "dayhour").'
'.img_object($langs->trans("ShowPayment"), "payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp), 'day')."$objp->paiement_type $objp->num_paiement'.price($objp->amount).''.price($objp->amount).''; if ($objp->statut == 0) diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php index c984ecd88f1..25204095f97 100644 --- a/htdocs/compta/payment_sc/card.php +++ b/htdocs/compta/payment_sc/card.php @@ -240,9 +240,9 @@ if ($resql) print ''.$langs->trans('SocialContribution').''.$langs->trans('Type').''.$langs->trans('Label').''.$langs->trans('ExpectedToPay').''.$langs->trans('ExpectedToPay').''.$langs->trans('Status').''.$langs->trans('PayedByThisPayment').''.$langs->trans('PayedByThisPayment').'
'.$objp->libelle.''.price($objp->sc_amount).''.price($objp->sc_amount).''.$socialcontrib->getLibStatut(4, $objp->amount).''.price($objp->amount).''.price($objp->amount).'
  '; + print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print '
'.dol_print_date($db->jdate($obj->datec), 'day')."'.price($obj->amount)."'.price($obj->amount)."'; + print ''; print $bon->LibStatut($obj->statut, 3); print '
'.price($obj->amount)."'.price($obj->amount)."'; @@ -397,7 +397,7 @@ if ($id > 0 || $ref) print '
'.$langs->trans("Total").' '; + print ''; if ($total != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices"); print price($total); print "'.$langs->trans("ThirdParty").''.$langs->trans("RIB").''.$langs->trans("RUM").''.$langs->trans("AmountTTC").''.$langs->trans("DateRequest").''.$langs->trans("AmountTTC").''.$langs->trans("DateRequest").'
'; + print ''; print price($obj->amount, 0, $langs, 0, 0, -1, $conf->currency); print ''; + print ''; print dol_print_date($db->jdate($obj->date_demande), 'day'); print '
'; print ''; - print ''; + print ''; print ''; while ($i < min($num,$limit)) @@ -335,7 +335,7 @@ if ($result) print '\n"; - print '\n"; + print '\n"; print "\n"; $i++; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index d4575ec0e8c..8f9df284291 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -110,8 +110,8 @@ if ($resql) print ''; print_liste_field_titre("Bill", $_SERVER["PHP_SELF"]); print_liste_field_titre("Company", $_SERVER["PHP_SELF"]); - print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "", "", $param, 'align="right"'); - print_liste_field_titre("DateRequest", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"'); + print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "", "", $param, 'class="right"'); + print_liste_field_titre("DateRequest", $_SERVER["PHP_SELF"], "", "", $param, 'class="center"'); print_liste_field_titre(''); print ''; @@ -121,7 +121,7 @@ if ($resql) print ''; print ''; // Action column - print ''; @@ -148,11 +148,11 @@ if ($resql) print $thirdpartystatic->getNomUrl(1, 'customer'); print ''; - print ''; + print ''; - print ''; + print ''; - print ''; + print ''; print ''; $i++; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 2d582c7a6a6..83ac9a3483b 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -205,8 +205,8 @@ if ($result) print ''; print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder); print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder); - print_liste_field_titre("AmountInvoice", $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "pl.amount", "", $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("AmountInvoice", $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder); + print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "pl.amount", "", $param, 'class="right"', $sortfield, $sortorder); print_liste_field_titre("StatusDebitCredit", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder); print_liste_field_titre(''); print "\n"; @@ -235,10 +235,10 @@ if ($result) print "\n"; // Amount of invoice - print '\n"; + print '\n"; // Amount requested - print '\n"; + print '\n"; // Status of requests print ''; print ''; print ''; - print '\n"; - print '\n"; print ''; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index a2b6d0db965..c930db99012 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -189,8 +189,8 @@ if ($resql) print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print '
'.$langs->trans("Ref").''.$langs->trans("Date").''.$langs->trans("Amount").''.$langs->trans("Date").''.$langs->trans("Amount").'
'.dol_print_date($db->jdate($obj->datec),'day')."'.price($obj->amount,0,$langs,0,0,-1,$conf->currency)."'.price($obj->amount,0,$langs,0,0,-1,$conf->currency)."
'; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1); print $searchpicto; print ''.price($obj->total_ttc).''.price($obj->total_ttc).''.dol_print_date($db->jdate($obj->date_demande), 'day').''.dol_print_date($db->jdate($obj->date_demande), 'day').'
'.price($obj->total_ttc)."'.price($obj->total_ttc)."'.price($obj->amount_requested)."'.price($obj->amount_requested)."'; @@ -273,11 +273,11 @@ if ($result) print '
'.$langs->trans("Total").' '; + print ''; //if ($totalinvoices != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices"); // It is normal to have total that differs. For an amount of invoice of 100, request to pay may be 50 only. if ($totalamount_requested != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices"); print "'; + print ''; print price($totalamount_requested); print " 
'; print ''; - print ''; - print ''; + print ''; + print ''; $total = 0; @@ -209,7 +209,7 @@ if ($resql) print ''; print '\n"; - print '\n"; + print '\n"; print ''; print ''; @@ -230,7 +230,7 @@ if ($resql) { print ''; print ''; - print '\n"; + print '\n"; print ''; print "\n"; } diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 5cacc6c5856..9cee7938737 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -160,7 +160,7 @@ if ($prev_id > 0 || $ref) print"\n\n"; print '
'.$langs->trans("Line").''.$langs->trans("ThirdParty").''.$langs->trans("Amount").''.$langs->trans("Reason").''.$langs->trans("ToBill").''.$langs->trans("Invoice").'
'.$langs->trans("Line").''.$langs->trans("ThirdParty").''.$langs->trans("Amount").''.$langs->trans("Reason").''.$langs->trans("ToBill").''.$langs->trans("Invoice").'
'.$obj->name."'.price($obj->amount)."'.price($obj->amount)."'.$rej->motifs[$obj->motif].''.yn($obj->afacturer).'
 '.$langs->trans("Total").''.price($total)."'.price($total)." 
'; print ''; - print ''; + print ''; while ($i < $num) { @@ -170,10 +170,10 @@ if ($prev_id > 0 || $ref) print $ligne->LibStatut($row[1], 1); - print ''; diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index ef20b5117a0..4e2c4e2d3a5 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -75,14 +75,14 @@ print '
'.$langs->trans("Status").''.$langs->trans("Amount").'%
'.$langs->trans("Status").''.$langs->trans("Amount").'%
'; + print ''; print price($row[0]); - print ''; + print ''; if ($object->amount) print round($row[0]/$object->amount*100, 2)." %"; print '
'; print ''; print ''; -print ''; print ''; -print '
'.$langs->trans("Statistics").'
'.$langs->trans("NbOfInvoiceToWithdraw").''; +print ''; print ''; print $bprev->NbFactureAPrelever(); print ''; print '
'.$langs->trans("AmountToWithdraw").''; +print ''; print price($bprev->SommeAPrelever(), '', '', 1, -1, -1, 'auto'); print '

'; @@ -137,15 +137,15 @@ if ($resql) print $thirdpartystatic->getNomUrl(1, 'customer'); print ''; - print ''; + print ''; print price($obj->amount); print ''; - print ''; + print ''; print dol_print_date($db->jdate($obj->date_demande), 'day'); print ''; - print ''; + print ''; print $invoicestatic->getLibStatut(3, $alreadypayed); print ''; print ''; @@ -186,8 +186,8 @@ if ($result) print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; while ($i < min($num, $limit)) @@ -204,8 +204,8 @@ if ($result) print $bprev->getNomUrl(1); print "\n"; print '\n"; - print '\n"; - print '\n"; + print '\n"; + print '\n"; print "\n"; $i++; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 977134f103f..33728093ec1 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -292,7 +292,7 @@ if ($id) print"\n\n"; print '
'.$langs->trans("LastWithdrawalReceipt", $limit).''.$langs->trans("Date").''.$langs->trans("Amount").''.$langs->trans("Status").''.$langs->trans("Amount").''.$langs->trans("Status").'
'.dol_print_date($db->jdate($obj->datec), "dayhour")."'.price($obj->amount)."'.$bprev->getLibStatut(3)."'.price($obj->amount)."'.$bprev->getLibStatut(3)."
'; print ''; - print ''; + print ''; print ''; $total = 0; @@ -312,9 +312,9 @@ if ($id) print '\n"; - print '\n"; + print '\n"; - print '\n"; diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index 3c8b461a8fc..8180517a2e8 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -146,7 +146,7 @@ if ($result) print ''; print ''; print ''; - print ''; @@ -159,7 +159,7 @@ if ($result) print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom"); print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", '', '', 'align="center"'); print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", "", 'align="center"'); - print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", "", 'align="right"'); + print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", "", 'class="right"'); print_liste_field_titre(''); print "\n"; @@ -194,7 +194,7 @@ if ($result) print '\n"; - print '\n"; + print '\n"; print ''; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index b7ca5d02bf3..9bd00ae0ce2 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -91,8 +91,8 @@ if ($resql) print"\n\n"; print '
'.$langs->trans("Invoice").''.$langs->trans("ThirdParty").''.$langs->trans("Amount").''.$langs->trans("Status").''.$langs->trans("Invoice").''.$langs->trans("ThirdParty").''.$langs->trans("Amount").''.$langs->trans("Status").'
'; print img_object($langs->trans("ShowCompany"), "company"). ' '.$obj->name."'.price($obj->total_ttc)."'.price($obj->total_ttc)."'; + print ''; $invoicestatic->fetch($obj->facid); print $invoicestatic->getLibStatut(5); print "  '; + print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print '
'.dol_print_date($db->jdate($obj->datec), 'day')."'.price($obj->amount)."'.price($obj->amount)." 
'; print ''; - print ''; - print ''; + print ''; + print ''; while ($i < $num) { @@ -105,24 +105,24 @@ if ($resql) print ''; $i++; } - print ''; - print ''; + print ''; + print ''; print "
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
'; print $row[1]; - print ''; + print ''; print round($row[1]/$nbtotal*100, 2)." %"; - print ''; + print ''; print price($row[0]); - print ''; + print ''; print round($row[0]/$total*100, 2)." %"; print '
'.$langs->trans("Total").''.$nbtotal.' '; + print '
'.$langs->trans("Total").''.$nbtotal.' '; print price($total); - print '  
"; $db->free(); } @@ -185,7 +185,7 @@ if ($resql) print ''; print ''; print ''; - print ''; + print ''; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; $Rejet = new RejetPrelevement($db, $user); @@ -199,13 +199,13 @@ if ($resql) print ''; @@ -213,10 +213,10 @@ if ($resql) $i++; } - print ''; - print ''; + print ''; + print ''; print "
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
%'.$langs->trans("Amount").'%
'.$row[1]; - print ''; + print ''; print round($row[1]/$nbtotal*100, 2)." %"; - print ''; + print ''; print price($row[0]); - print ''; + print ''; print round($row[0]/$total*100, 2)." %"; print '
'.$langs->trans("Total").''.$nbtotal.' '; + print '
'.$langs->trans("Total").''.$nbtotal.' '; print price($total); - print '  
"; $db->free($resql); } diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index c95ca219350..fef607ac0dd 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -222,15 +222,15 @@ print_liste_field_titre("PredefinedGroups", $_SERVER["PHP_SELF"], 'f.thirdparty_ print_liste_field_titre(''); if ($modecompta == 'BOOKKEEPING') { - print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'class="right"', $sortfield, $sortorder); } else { if ($modecompta == 'CREANCES-DETTES') { - print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'class="right"', $sortfield, $sortorder); } - print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], 'amount_ttc', '', $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], 'amount_ttc', '', $param, 'class="right"', $sortfield, $sortorder); } print "\n"; @@ -284,7 +284,7 @@ if ($modecompta == 'BOOKKEEPING') print ''; print ' '; print ''.$objp->pcg_type.($objp->pcg_subtype != 'XXXXXX'?' - '.$objp->pcg_subtype:'').($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); @@ -317,7 +317,7 @@ if ($modecompta == 'BOOKKEEPING') print ''; print ''; print '     ' . length_accountg($cpt['account_number']) . ' - ' . $cpt['account_label'] . ''; - print '' . price($resultN) . ''; + print '' . price($resultN) . ''; print "\n"; } } @@ -389,8 +389,8 @@ else print "".$langs->trans("Bills").' '.$objp->name."\n"; if ($modecompta == 'CREANCES-DETTES') - print "".price($objp->amount_ht)."\n"; - print "".price($objp->amount_ttc)."\n"; + print ''.price($objp->amount_ht)."\n"; + print ''.price($objp->amount_ttc)."\n"; $total_ht += (isset($objp->amount_ht)?$objp->amount_ht:0); $total_ttc += $objp->amount_ttc; @@ -434,8 +434,8 @@ else 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_ttc)."\n"; + print ''.price($objp->amount_ht)."\n"; + print ''.price($objp->amount_ttc)."\n"; $total_ht += (isset($objp->amount_ht)?$objp->amount_ht:0); $total_ttc += $objp->amount_ttc; @@ -459,8 +459,8 @@ else print ''; if ($modecompta == 'CREANCES-DETTES') - print ''.price($total_ht).''; - print ''.price($total_ttc).''; + print ''.price($total_ht).''; + print ''.price($total_ttc).''; print ''; @@ -519,8 +519,8 @@ else print "".$langs->trans("Bills")." socid."\">".$objp->name."\n"; if ($modecompta == 'CREANCES-DETTES') - print "".price(-$objp->amount_ht)."\n"; - print "".price(-$objp->amount_ttc)."\n"; + print ''.price(-$objp->amount_ht)."\n"; + print ''.price(-$objp->amount_ttc)."\n"; $total_ht -= (isset($objp->amount_ht)?$objp->amount_ht:0); $total_ttc -= $objp->amount_ttc; @@ -544,8 +544,8 @@ else } print ''; if ($modecompta == 'CREANCES-DETTES') - print ''.price(-$subtotal_ht).''; - print ''.price(-$subtotal_ttc).''; + print ''.price(-$subtotal_ht).''; + print ''.price(-$subtotal_ttc).''; print ''; @@ -605,8 +605,8 @@ else print ' '; print ''.$obj->label.''; - if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount).''; - print ''.price(-$obj->amount).''; + if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount).''; + print ''.price(-$obj->amount).''; print ''; $i++; } @@ -621,8 +621,8 @@ else } print ''; if ($modecompta == 'CREANCES-DETTES') - print ''.price(-$subtotal_ht).''; - print ''.price(-$subtotal_ttc).''; + print ''.price(-$subtotal_ht).''; + print ''.price(-$subtotal_ttc).''; print ''; @@ -682,8 +682,8 @@ else 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++; } @@ -698,8 +698,8 @@ else } print ''; if ($modecompta == 'CREANCES-DETTES') - print ''.price(-$subtotal_ht).''; - print ''.price(-$subtotal_ttc).''; + print ''.price(-$subtotal_ht).''; + print ''.price(-$subtotal_ttc).''; print ''; if ($mysoc->tva_assuj == 'franchise') // Non assujetti @@ -709,10 +709,10 @@ else print ' '; print ''; - print ''.$langs->trans("Profit").''; + print ''.$langs->trans("Profit").''; if ($modecompta == 'CREANCES-DETTES') - print ''.price($total_ht).''; - print ''.price($total_ttc).''; + print ''.price($total_ht).''; + print ''.price($total_ttc).''; print ''; print ''; @@ -775,8 +775,8 @@ else print "".$langs->trans("Salary")." fk_user."\">".$obj->firstname." ".$obj->lastname."\n"; - if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount).''; - print ''.price(-$obj->amount).''; + if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount).''; + print ''.price(-$obj->amount).''; print ''; $i++; } @@ -794,8 +794,8 @@ else } print ''; if ($modecompta == 'CREANCES-DETTES') - print ''.price(-$subtotal_ht).''; - print ''.price(-$subtotal_ttc).''; + print ''.price(-$subtotal_ht).''; + print ''.price(-$subtotal_ttc).''; print ''; } @@ -862,8 +862,8 @@ else print "".$langs->trans("ExpenseReport")." userid."\">".$obj->firstname." ".$obj->lastname."\n"; - if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount_ht).''; - print ''.price(-$obj->amount_ttc).''; + if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount_ht).''; + print ''.price(-$obj->amount_ttc).''; print ''; } } @@ -879,8 +879,8 @@ else dol_print_error($db); } print ''; - if ($modecompta == 'CREANCES-DETTES') print ''.price(-$subtotal_ht).''; - print ''.price(-$subtotal_ttc).''; + if ($modecompta == 'CREANCES-DETTES') print ''.price(-$subtotal_ht).''; + print ''.price(-$subtotal_ttc).''; print ''; } @@ -943,8 +943,8 @@ else 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).''; + if ($modecompta == 'CREANCES-DETTES') print ''.price($obj->amount).''; + print ''.price($obj->amount).''; print ''; $i++; } @@ -962,8 +962,8 @@ else } print ''; if ($modecompta == 'CREANCES-DETTES') - print ''.price($subtotal_ht).''; - print ''.price($subtotal_ttc).''; + print ''.price($subtotal_ht).''; + print ''.price($subtotal_ttc).''; print ''; } @@ -1024,8 +1024,8 @@ else } print ' '; print "".$langs->trans("VATToPay")."\n"; - print " \n"; - print "".price($amount)."\n"; + print ' '."\n"; + print ''.price($amount)."\n"; print "\n"; // TVA a recuperer @@ -1072,9 +1072,9 @@ else dol_print_error($db); } print ' '; - print "".$langs->trans("VATToCollect")."\n"; - print " \n"; - print "".price($amount)."\n"; + print ''.$langs->trans("VATToCollect")."\n"; + print ' '."\n"; + print ''.price($amount)."\n"; print "\n"; } else @@ -1119,8 +1119,8 @@ else print ' '; print "".$langs->trans("VATPaid")."\n"; if ($modecompta == 'CREANCES-DETTES') - print "".price($amount)."\n"; - print "".price($amount)."\n"; + print ''.price($amount)."\n"; + print ''.price($amount)."\n"; print "\n"; // VAT really received @@ -1165,8 +1165,8 @@ else print ' '; print "".$langs->trans("VATCollected")."\n"; if ($modecompta == 'CREANCES-DETTES') - print "".price($amount)."\n"; - print "".price($amount)."\n"; + print ''.price($amount)."\n"; + print ''.price($amount)."\n"; print "\n"; } } @@ -1175,8 +1175,8 @@ else { print ''; if ($modecompta == 'CREANCES-DETTES') - print ' '; - print ''.price(price2num($subtotal_ttc, 'MT')).''; + print ' '; + print ''.price(price2num($subtotal_ttc, 'MT')).''; print ''; } } @@ -1199,10 +1199,10 @@ if ($mysoc->tva_assuj != 'franchise') // Assujetti print ' '; print ''; - print ''.$langs->trans("Profit").''; + print ''.$langs->trans("Profit").''; if ($modecompta == 'CREANCES-DETTES') - print ''.price(price2num($total_ht, 'MT')).''; - print ''.price(price2num($total_ttc, 'MT')).''; + print ''.price(price2num($total_ht, 'MT')).''; + print ''.price(price2num($total_ttc, 'MT')).''; print ''; }