From 76d46652b73bf00c0b968364d09ae30832e8ac84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 5 Jan 2021 20:17:26 +0100 Subject: [PATCH] doxygen --- .../thirdparty_lettering_customer.php | 78 ++++++++++--------- .../thirdparty_lettering_supplier.php | 73 ++++++++--------- 2 files changed, 77 insertions(+), 74 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php index e831e21f814..2d90c9a7b14 100644 --- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php +++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php @@ -4,7 +4,7 @@ * Copyright (C) 2013 Olivier Geffroy * Copyright (C) 2013 Florian Henry * Copyright (C) 2013-2019 Alexandre Spangaro - * Copyright (C) 2018-2019 Frédéric France + * Copyright (C) 2018-2020 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,14 +37,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; // Load translation files required by the page $langs->loadLangs(array("compta", "accountancy")); -$action = GETPOST('action', 'aZ09'); +$action = GETPOST('action', 'aZ09'); $massaction = GETPOST('massaction', 'alpha'); $show_files = GETPOST('show_files', 'int'); -$confirm = GETPOST('confirm', 'alpha'); -$toselect = GETPOST('toselect', 'array'); -$socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int'); +$confirm = GETPOST('confirm', 'alpha'); +$toselect = GETPOST('toselect', 'array'); +// $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int'); +// Security check +$socid = GETPOSTINT("socid"); +// if ($user->socid) $socid=$user->socid; -$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; +$limit = GETPOSTISSET('limit') ? GETPOST('limit', 'int') : $conf->liste_limit; $sortfield = GETPOST("sortfield", 'alpha'); $sortorder = GETPOST("sortorder", 'alpha'); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); @@ -54,10 +57,12 @@ if (empty($page) || $page == - 1) { $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -if ($sortorder == "") +if ($sortorder == "") { $sortorder = "ASC"; -if ($sortfield == "") +} +if ($sortfield == "") { $sortfield = "bk.doc_date"; +} /* $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int')); @@ -74,23 +79,18 @@ if (!empty($lettering)) { /* if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers { - $search_date_start = ''; - $search_date_end = ''; + $search_date_start = ''; + $search_date_end = ''; //$search_doc_type = ''; $search_doc_ref = ''; } */ -// Security check -$socid = GETPOST("socid", 'int'); -// if ($user->socid) $socid=$user->socid; - $lettering = new Lettering($db); $object = new Societe($db); $object->id = $socid; $result = $object->fetch($socid); -if ($result < 0) -{ +if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); } @@ -208,30 +208,30 @@ if ($resql) { print ''."\n"; /* - print ''; - //print ''; + print ''; + //print ''; - // Date - print ''; + // Date + print ''; - // Piece - print ''; + // Piece + print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; */ print ''; @@ -251,7 +251,9 @@ 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($tmp)) { + $tmp = $obj->lettering_code; + } /*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/ $solde += ($obj->credit - $obj->debit); print ''; diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php index b5620f3ec25..31acb9f0191 100644 --- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php +++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php @@ -41,7 +41,11 @@ $massaction = GETPOST('massaction', 'alpha'); $show_files = GETPOST('show_files', 'int'); $confirm = GETPOST('confirm', 'alpha'); $toselect = GETPOST('toselect', 'array'); -$socid = GETPOST('socid', 'int') ? ((int) GETPOST('socid', 'int')) : ((int) GETPOST('id', 'int')); +// $socid = GETPOST('socid', 'int') ? ((int) GETPOST('socid', 'int')) : ((int) GETPOST('id', 'int')); +// Security check +$socid = GETPOSTINT("socid"); +// if ($user->socid) $socid=$user->socid; + $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; $sortfield = GETPOST("sortfield", 'alpha'); @@ -53,10 +57,12 @@ if (empty($page) || $page == - 1) { $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -if ($sortorder == "") +if ($sortorder == "") { $sortorder = "ASC"; -if ($sortfield == "") +} +if ($sortfield == "") { $sortfield = "bk.doc_date"; +} /* $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int')); @@ -73,24 +79,18 @@ if (!empty($lettering)) { /* if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers { - $search_date_start = ''; - $search_date_end = ''; + $search_date_start = ''; + $search_date_end = ''; //$search_doc_type=''; $search_doc_ref=''; } */ - -// Security check -$socid = GETPOST("socid", 'int'); -// if ($user->socid) $socid=$user->socid; - $lettering = new Lettering($db); $object = new Societe($db); $object->id = $socid; $result = $object->fetch($socid); -if ($result < 0) -{ +if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); } @@ -159,8 +159,7 @@ $solde = 0; // Count total nb of records and calc total sum $nbtotalofrecords = ''; $resql = $db->query($sql); -if (!$resql) -{ +if (!$resql) { dol_print_error($db); exit; } @@ -206,30 +205,30 @@ if ($resql) { print '
'; - print '
'; - print $langs->trans('From') . ' '; - print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1); - print '
'; - print '
'; - print $langs->trans('to') . ' '; - print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1); - print '
'; - print '		'; + print '
'; + print $langs->trans('From') . ' '; + print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1); + print '
'; + print '
'; + print $langs->trans('to') . ' '; + print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1); + print '
'; + print '		 '; - $searchpicto = $form->showFilterButtons(); - print $searchpicto; - print '
 '; + $searchpicto = $form->showFilterButtons(); + print $searchpicto; + print '
'."\n"; /* - print ''; - //print ''; + print ''; + //print ''; - // Date - print ''; + // Date + print ''; - // Piece - print ''; + // Piece + print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; */ print ''; @@ -248,7 +247,9 @@ if ($resql) { $solde = 0; $tmp = ''; while ($obj = $db->fetch_object($resql)) { - if ($tmp != $obj->lettering_code || empty($tmp)) $tmp = $obj->lettering_code; + 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 '';
'; - print '
'; - print $langs->trans('From') . ' '; - print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1); - print '
'; - print '
'; - print $langs->trans('to') . ' '; - print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1); - print '
'; - print '		'; + print '
'; + print $langs->trans('From') . ' '; + print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1); + print '
'; + print '
'; + print $langs->trans('to') . ' '; + print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1); + print '
'; + print '		 '; - $searchpicto = $form->showFilterButtons(); - print $searchpicto; - print '
 '; + $searchpicto = $form->showFilterButtons(); + print $searchpicto; + print '