diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 35c6aa399fe..45cb1f03bb8 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -32,8 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
$langs->loadLangs(array('compta', 'banks', 'bills'));
$id = GETPOST("id", 'int');
-$action = GETPOST("action", "alpha");
-$cancel = GETPOST('cancel');
+$action = GETPOST("action", "aZ09");
+$cancel = GETPOST('cancel', 'aZ09');
$refund = GETPOST("refund", "int");
if (empty($refund)) {
@@ -143,7 +143,7 @@ $form = new Form($db);
$title = $langs->trans("LT".$object->ltt)." - ".$langs->trans("Card");
$help_url = '';
-llxHeader("", $title, $helpurl);
+llxHeader('', $title, $helpurl);
if ($action == 'create') {
print load_fiche_titre($langs->transcountry($lttype == 2 ? "newLT2Payment" : "newLT1Payment", $mysoc->country_code));
@@ -157,11 +157,13 @@ if ($action == 'create') {
print '
';
+ // Date of payment
print "";
print ''.$langs->trans("DatePayment").' ';
print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
print ' ';
+ // End date of period
print ''.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).' ';
print $form->selectDate($datev, "datev", '', '', '', 'add', 1, 1);
print ' ';
@@ -173,20 +175,24 @@ if ($action == 'create') {
print ''.$langs->trans("Amount").' ';
if (!empty($conf->banque->enabled)) {
- print ''.$langs->trans("Account").' ';
- $form->select_comptes(GETPOST("accountid", "int"), "accountid", 0, "courant=1", 2); // Affiche liste des comptes courant
- print ' ';
-
+ // Type payment
print ''.$langs->trans("PaymentMode").' ';
- $form->select_types_paiements(GETPOST("paiementtype"), "paiementtype");
+ $form->select_types_paiements(GETPOST("paiementtype"), "paiementtype", '', 0, 1, 0, 0, 1,'maxwidth500 widthcentpercentminusx');
print " \n";
print " ";
+
+ // Bank account
+ print ''.$langs->trans("Account").' ';
+ print img_picto('', 'bank_account', 'pictofixedwidth');
+ $form->select_comptes(GETPOST("accountid", "int"), "accountid", 0, "courant=1", 2, '', 0, 'maxwidth500 widthcentpercentminusx'); // Affiche liste des comptes courant
+ print ' ';
// Number
print ''.$langs->trans('Numero');
print ' ('.$langs->trans("ChequeOrTransferNumber").') ';
print ' '."\n";
}
+
// Other attributes
$parameters = array();
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 6590e250832..6f6fc303262 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -63,6 +63,7 @@ if ($result) {
$i = 0;
$total = 0;
+ print ''; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '
';
print '';
print ''.$langs->trans("Ref").' ';
@@ -85,7 +86,7 @@ if ($result) {
print ''.dol_print_date($db->jdate($obj->datep), 'day')." \n";
$total = $total + $obj->amount;
- print "".price($obj->amount)." ";
+ print ''.price($obj->amount).' ';
print " \n";
$i++;
@@ -94,6 +95,8 @@ if ($result) {
print ''.price($total).' ';
print "
";
+ print '
';
+
$db->free($result);
} else {
dol_print_error($db);
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index ce224735927..2f7b775096d 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -207,14 +207,15 @@ if ($action == 'create') {
print '';
print ''.$langs->trans("PaymentMode").' ';
- $form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype", "int") : $tva->paiementtype, "paiementtype");
+ $form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype", "int") : $tva->paiementtype, "paiementtype", '', 0, 1, 0, 0, 1,'maxwidth500 widthcentpercentminusx');
print " \n";
print ' ';
print '';
print ''.$langs->trans('AccountToDebit').' ';
print '';
- $form->select_comptes(GETPOST("accountid") ? GETPOST("accountid", "int") : $tva->accountid, "accountid", 0, '', 1); // Show opend bank account list
+ print img_picto('', 'bank_account', 'pictofixedwidth');
+ $form->select_comptes(GETPOST("accountid", "int") ? GETPOST("accountid", "int") : $tva->accountid, "accountid", 0, '', 1, '', 0, 'maxwidth500 widthcentpercentminusx'); // Show opend bank account list
print ' ';
// Number
@@ -225,7 +226,7 @@ if ($action == 'create') {
print '';
print ''.$langs->trans("Comments").' ';
- print ' ';
+ print ' ';
print ' ';
print '
';
@@ -238,6 +239,7 @@ if ($action == 'create') {
$num = 1;
$i = 0;
+ print ''; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '
";
+ print '
';
// Bouton Save payment
print ' '.$langs->trans("ClosePaidVATAutomatically");
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 317838009c7..3ffb405f8ad 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -460,7 +460,7 @@ if ($action == 'create') {
print '
';
print '';
- //print " \n";
+ print "\n";
// Label
if ($refund == 1) {
@@ -468,7 +468,7 @@ if ($action == 'create') {
} else {
$label = $langs->trans("VATPayment");
}
- print ''.$langs->trans("Label").' ';
+ print ''.$langs->trans("Label").' ';
print ''.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).' ';
print $form->selectDate((GETPOST("datevmonth", 'int') ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
@@ -490,14 +490,15 @@ if ($action == 'create') {
// Type payment
print ' '.$langs->trans("PaymentMode").' ';
- $form->select_types_paiements(GETPOST("type_payment"), "type_payment");
+ $form->select_types_paiements(GETPOST("type_payment", 'int'), "type_payment", '', 0, 1, 0, 0, 1,'maxwidth500 widthcentpercentminusx');
print " \n";
print " ";
if (!empty($conf->banque->enabled)) {
+ // Bank account
print ''.$langs->trans("BankAccount").' ';
print img_picto('', 'bank_account', 'pictofixedwidth');
- $form->select_comptes(GETPOST("accountid", 'int'), "accountid", 0, "courant=1", 1); // List of bank account available
+ $form->select_comptes(GETPOST("accountid", 'int'), "accountid", 0, "courant=1", 1, '', 0, 'maxwidth500 widthcentpercentminusx'); // List of bank account available
print ' ';
}
@@ -509,7 +510,7 @@ if ($action == 'create') {
// Comments
print '';
print ''.$langs->trans("Comments").' ';
- print ' ';
+ print ' ';
print ' ';
// Other attributes