lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update code

Browse Source
This commit is contained in:
Alexandre SPANGARO 2018-10-20 11:20:53 +02:00
parent 921757c4a3
commit a7de7013a1
3 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
View File

@ -60,11 +60,10 @@ $search_year = GETPOST("search_year", 'int');
$search_doc_type = GETPOST("search_doc_type", 'alpha'); $search_doc_type = GETPOST("search_doc_type", 'alpha');
$search_doc_ref = GETPOST("search_doc_ref", 'alpha'); $search_doc_ref = GETPOST("search_doc_ref", 'alpha');
$lettering = GETPOST('lettering'); $lettering = GETPOST('lettering', 'alpha');
if (! empty($lettering)) { if (! empty($lettering)) {
$action = $lettering; $action = $lettering;
} }
$toselect = GETPOST('toselect', 'array');
// Did we click on purge search criteria ? // Did we click on purge search criteria ?
// All tests are required to be compatible with all browsers // All tests are required to be compatible with all browsers
@ -93,7 +92,7 @@ if ($result < 0)
if ($action == 'lettering') { if ($action == 'lettering') {
$result = $lettering->updateLettrage($toselect); $result = $lettering->updateLettering($toselect);
if ($result < 0) { if ($result < 0) {
setEventMessages('', $lettering->errors, 'errors'); setEventMessages('', $lettering->errors, 'errors');
@ -216,12 +215,8 @@ if ($resql) {
$tmp = ''; $tmp = '';
while ( $obj = $db->fetch_object($resql) ) { while ( $obj = $db->fetch_object($resql) ) {
if ($tmp != $obj->lettering_code || empty($tmp)) if ($tmp != $obj->lettering_code || empty($tmp)) $tmp = $obj->lettering_code;
$tmp = $obj->lettering_code; /*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/ $solde += ($obj->credit - $obj->debit);
if ($tmp != $obj->lettering_code || empty($obj->lettering_code))
$solde += ($obj->credit - $obj->debit);
print '<tr class="oddeven">'; print '<tr class="oddeven">';
@ -229,8 +224,9 @@ if ($resql) {
print '<td><a href="' . dol_buildpath('/accountancy/bookkeeping/card.php', 1) . '?piece_num=' . $obj->piece_num . '">'; print '<td><a href="' . dol_buildpath('/accountancy/bookkeeping/card.php', 1) . '?piece_num=' . $obj->piece_num . '">';
print img_edit(); print img_edit();
print '</a>&nbsp;' . $obj->doc_type . '</td>' . "\n"; print '</a>&nbsp;' . $obj->doc_type . '</td>' . "\n";
} else } else {
print '<td>' . $obj->doc_type . '</td>' . "\n"; print '<td>' . $obj->doc_type . '</td>' . "\n";
}
print '<td>' . dol_print_date($db->jdate($obj->doc_date), 'day') . '</td>'; print '<td>' . dol_print_date($db->jdate($obj->doc_date), 'day') . '</td>';
print '<td>' . $obj->doc_ref . '</td>'; print '<td>' . $obj->doc_ref . '</td>';
@ -249,14 +245,15 @@ if ($resql) {
} }
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td colspan="4">'.$langs->trans("Total").':</td>' . "\n"; print '<td align="right" colspan="4">'.$langs->trans("Total").':</td>' . "\n";
print '<td align="right"><strong>' . price($debit) . '</strong></td>'; print '<td align="right"><strong>' . price($debit) . '</strong></td>';
print '<td align="right"><strong>' . price($credit) . '</strong></td>'; print '<td align="right"><strong>' . price($credit) . '</strong></td>';
print '<td colspan="5"></td>'; print '<td colspan="5"></td>';
print "</tr>\n"; print "</tr>\n";
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td colspan="6">'.$langs->trans("Balancing").':</td>' . "\n"; print '<td align="right" colspan="4">'.$langs->trans("Balancing").':</td>' . "\n";
print '<td colspan="2">&nbsp;</td>';
print '<td align="right"><strong>' . price($credit - $debit) . '</strong></td>'; print '<td align="right"><strong>' . price($credit - $debit) . '</strong></td>';
print '<td colspan="3"></td>'; print '<td colspan="3"></td>';
print "</tr>\n"; print "</tr>\n";

23
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
View File

@ -60,11 +60,10 @@ $search_year = GETPOST("search_year",'int');
$search_doc_type = GETPOST("search_doc_type",'alpha'); $search_doc_type = GETPOST("search_doc_type",'alpha');
$search_doc_ref = GETPOST("search_doc_ref",'alpha'); $search_doc_ref = GETPOST("search_doc_ref",'alpha');
$lettering = GETPOST('lettering'); $lettering = GETPOST('lettering', 'alpha');
if (!empty($lettering)) { if (!empty($lettering)) {
$action=$lettering; $action=$lettering;
} }
$toselect = GETPOST('toselect','array');
// Did we click on purge search criteria ? // Did we click on purge search criteria ?
// All tests are required to be compatible with all browsers // All tests are required to be compatible with all browsers
@ -94,7 +93,7 @@ if ($result<0)
*/ */
if ($action == 'lettering') { if ($action == 'lettering') {
$result = $lettering->updateLettrage($toselect); $result = $lettering->updateLettering($toselect);
if ($result < 0) { if ($result < 0) {
setEventMessages('', $lettering->errors, 'errors'); setEventMessages('', $lettering->errors, 'errors');
@ -219,12 +218,8 @@ if ($resql) {
$tmp = ''; $tmp = '';
while ($obj = $db->fetch_object($resql)) { while ($obj = $db->fetch_object($resql)) {
if ($tmp != $obj->lettering_code || empty($tmp)) if ($tmp != $obj->lettering_code || empty($tmp)) $tmp = $obj->lettering_code;
$tmp = $obj->lettering_code; /*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/ $solde += ($obj->credit - $obj->debit);
if ($tmp != $obj->lettering_code || empty($obj->lettering_code))
$solde += ($obj->credit - $obj->debit);
print '<tr class="oddeven">'; print '<tr class="oddeven">';
@ -232,8 +227,9 @@ if ($resql) {
print '<td><a href="' . dol_buildpath('/accountancy/bookkeeping/card.php', 1) . '?piece_num=' . $obj->piece_num . '">'; print '<td><a href="' . dol_buildpath('/accountancy/bookkeeping/card.php', 1) . '?piece_num=' . $obj->piece_num . '">';
print img_edit(); print img_edit();
print '</a>&nbsp;' . $obj->doc_type . '</td>' . "\n"; print '</a>&nbsp;' . $obj->doc_type . '</td>' . "\n";
} else } else {
print '<td>' . $obj->doc_type . '</td>' . "\n"; print '<td>' . $obj->doc_type . '</td>' . "\n";
}
print '<td>' . dol_print_date($db->jdate($obj->doc_date), 'day') . '</td>'; print '<td>' . dol_print_date($db->jdate($obj->doc_date), 'day') . '</td>';
print '<td>' . $obj->doc_ref . '</td>'; print '<td>' . $obj->doc_ref . '</td>';
@ -252,21 +248,22 @@ if ($resql) {
} }
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td colspan="4">'.$langs->trans("Total").':</td>' . "\n"; print '<td align="right" colspan="4">'.$langs->trans("Total").':</td>' . "\n";
print '<td align="right"><strong>' . price($debit) . '</strong></td>'; print '<td align="right"><strong>' . price($debit) . '</strong></td>';
print '<td align="right"><strong>' . price($credit) . '</strong></td>'; print '<td align="right"><strong>' . price($credit) . '</strong></td>';
print '<td colspan="5"></td>'; print '<td colspan="5"></td>';
print "</tr>\n"; print "</tr>\n";
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td colspan="6">'.$langs->trans("Balancing").':</td>' . "\n"; print '<td align="right" colspan="4">'.$langs->trans("Balancing").':</td>' . "\n";
print '<td colspan="2">&nbsp;</td>';
print '<td align="right"><strong>' . price($credit - $debit) . '</strong></td>'; print '<td align="right"><strong>' . price($credit - $debit) . '</strong></td>';
print '<td colspan="3"></td>'; print '<td colspan="3"></td>';
print "</tr>\n"; print "</tr>\n";
print "</table>"; print "</table>";
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid=' . $object->id . '&action=lettering">'.$langs->trans('AccountancyLettering').'</a>'; print '<input class="butAction" type="submit" value="' . $langs->trans('AccountancyLettering') . '" name="lettering" id="lettering">';
//print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid=' . $object->id . '&action=autolettrage">'.$langs->trans('AccountancyAutoLettering').'</a>'; //print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid=' . $object->id . '&action=autolettrage">'.$langs->trans('AccountancyAutoLettering').'</a>';
print "</form>"; print "</form>";
$db->free($resql); $db->free($resql);

2
htdocs/accountancy/class/lettering.class.php
View File

@ -229,7 +229,7 @@ class lettering extends BookKeeping
* @param boolean $notrigger no trigger * @param boolean $notrigger no trigger
* @return number * @return number
*/ */
public function updateLettrage($ids = array(), $notrigger = false) public function updateLettering($ids = array(), $notrigger = false)
{ {
$error = 0; $error = 0;
$lettre = 'AAA'; $lettre = 'AAA';