diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 08994e3853d..0cab173823c 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -60,11 +60,10 @@ $search_year = GETPOST("search_year", 'int');
$search_doc_type = GETPOST("search_doc_type", 'alpha');
$search_doc_ref = GETPOST("search_doc_ref", 'alpha');
-$lettering = GETPOST('lettering');
+$lettering = GETPOST('lettering', 'alpha');
if (! empty($lettering)) {
$action = $lettering;
}
-$toselect = GETPOST('toselect', 'array');
// Did we click on purge search criteria ?
// All tests are required to be compatible with all browsers
@@ -93,7 +92,7 @@ if ($result < 0)
if ($action == 'lettering') {
- $result = $lettering->updateLettrage($toselect);
+ $result = $lettering->updateLettering($toselect);
if ($result < 0) {
setEventMessages('', $lettering->errors, 'errors');
@@ -216,12 +215,8 @@ if ($resql) {
$tmp = '';
while ( $obj = $db->fetch_object($resql) ) {
- if ($tmp != $obj->lettering_code || empty($tmp))
- $tmp = $obj->lettering_code;
-
- if ($tmp != $obj->lettering_code || empty($obj->lettering_code))
-
- $solde += ($obj->credit - $obj->debit);
+ if ($tmp != $obj->lettering_code || empty($tmp)) $tmp = $obj->lettering_code;
+ /*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/ $solde += ($obj->credit - $obj->debit);
print '
';
@@ -229,8 +224,9 @@ if ($resql) {
print '| ';
print img_edit();
print ' ' . $obj->doc_type . ' | ' . "\n";
- } else
+ } else {
print '' . $obj->doc_type . ' | ' . "\n";
+ }
print '' . dol_print_date($db->jdate($obj->doc_date), 'day') . ' | ';
print '' . $obj->doc_ref . ' | ';
@@ -249,14 +245,15 @@ if ($resql) {
}
print '
';
- print '| '.$langs->trans("Total").': | ' . "\n";
+ print ''.$langs->trans("Total").': | ' . "\n";
print '' . price($debit) . ' | ';
print '' . price($credit) . ' | ';
print ' | ';
print "
\n";
print '';
- print '| '.$langs->trans("Balancing").': | ' . "\n";
+ print ''.$langs->trans("Balancing").': | ' . "\n";
+ print ' | ';
print '' . price($credit - $debit) . ' | ';
print ' | ';
print "
\n";
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index 0da446301c6..659643260f9 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -60,11 +60,10 @@ $search_year = GETPOST("search_year",'int');
$search_doc_type = GETPOST("search_doc_type",'alpha');
$search_doc_ref = GETPOST("search_doc_ref",'alpha');
-$lettering = GETPOST('lettering');
+$lettering = GETPOST('lettering', 'alpha');
if (!empty($lettering)) {
$action=$lettering;
}
-$toselect = GETPOST('toselect','array');
// Did we click on purge search criteria ?
// All tests are required to be compatible with all browsers
@@ -94,7 +93,7 @@ if ($result<0)
*/
if ($action == 'lettering') {
- $result = $lettering->updateLettrage($toselect);
+ $result = $lettering->updateLettering($toselect);
if ($result < 0) {
setEventMessages('', $lettering->errors, 'errors');
@@ -219,12 +218,8 @@ if ($resql) {
$tmp = '';
while ($obj = $db->fetch_object($resql)) {
- if ($tmp != $obj->lettering_code || empty($tmp))
- $tmp = $obj->lettering_code;
-
- if ($tmp != $obj->lettering_code || empty($obj->lettering_code))
-
- $solde += ($obj->credit - $obj->debit);
+ if ($tmp != $obj->lettering_code || empty($tmp)) $tmp = $obj->lettering_code;
+ /*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/ $solde += ($obj->credit - $obj->debit);
print '';
@@ -232,8 +227,9 @@ if ($resql) {
print '| ';
print img_edit();
print ' ' . $obj->doc_type . ' | ' . "\n";
- } else
+ } else {
print '' . $obj->doc_type . ' | ' . "\n";
+ }
print '' . dol_print_date($db->jdate($obj->doc_date), 'day') . ' | ';
print '' . $obj->doc_ref . ' | ';
@@ -252,21 +248,22 @@ if ($resql) {
}
print '
';
- print '| '.$langs->trans("Total").': | ' . "\n";
+ print ''.$langs->trans("Total").': | ' . "\n";
print '' . price($debit) . ' | ';
print '' . price($credit) . ' | ';
print ' | ';
print "
\n";
print '';
- print '| '.$langs->trans("Balancing").': | ' . "\n";
+ print ''.$langs->trans("Balancing").': | ' . "\n";
+ print ' | ';
print '' . price($credit - $debit) . ' | ';
print ' | ';
print "
\n";
print "";
- print 'id . '&action=lettering">'.$langs->trans('AccountancyLettering').'';
+ print '';
//print 'id . '&action=autolettrage">'.$langs->trans('AccountancyAutoLettering').'';
print "";
$db->free($resql);
diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
index 488941cbc02..b6eeba24c01 100644
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -229,7 +229,7 @@ class lettering extends BookKeeping
* @param boolean $notrigger no trigger
* @return number
*/
- public function updateLettrage($ids = array(), $notrigger = false)
+ public function updateLettering($ids = array(), $notrigger = false)
{
$error = 0;
$lettre = 'AAA';