';
- print '| ' . length_accountg($cpt->account_number) . ' | ';
- print '' . $cpt->label . ' | ';
+ print ''.length_accountg($cpt->account_number).' | ';
+ print ''.$cpt->label.' | ';
print '';
- print "";
+ print "rowid."'>";
print $langs->trans("DeleteFromCat");
print img_picto($langs->trans("DeleteFromCat"), 'unlink');
print "";
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 852349d0516..2d633debbae 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -32,13 +32,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("errors","admin","companies","resource","holiday","accountancy","hrm"));
+$langs->loadLangs(array("errors", "admin", "companies", "resource", "holiday", "accountancy", "hrm"));
-$action=GETPOST('action', 'aZ09')?GETPOST('action', 'aZ09'):'view';
-$confirm=GETPOST('confirm', 'alpha');
-$id=32;
-$rowid=GETPOST('rowid', 'alpha');
-$code=GETPOST('code', 'alpha');
+$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
+$confirm = GETPOST('confirm', 'alpha');
+$id = 32;
+$rowid = GETPOST('rowid', 'alpha');
+$code = GETPOST('code', 'alpha');
// Security access
if (empty($user->rights->accounting->chartofaccount)) {
@@ -50,15 +50,15 @@ $acts[1] = "disable";
$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off');
$actl[1] = img_picto($langs->trans("Activated"), 'switch_on');
-$listoffset=GETPOST('listoffset', 'alpha');
-$listlimit=GETPOST('listlimit', 'int')>0?GETPOST('listlimit', 'int'):1000;
+$listoffset = GETPOST('listoffset', 'alpha');
+$listlimit = GETPOST('listlimit', 'int') > 0 ?GETPOST('listlimit', 'int') : 1000;
$active = 1;
$sortfield = GETPOST("sortfield", 'aZ09comma');
$sortorder = GETPOST("sortorder", 'aZ09comma');
$page = GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
-$offset = $listlimit * $page ;
+$offset = $listlimit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
@@ -71,52 +71,52 @@ $hookmanager->initHooks(array('admin'));
// Put here declaration of dictionaries properties
// Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(32);
+$taborder = array(32);
// Name of SQL tables of dictionaries
-$tabname=array();
-$tabname[32]= MAIN_DB_PREFIX."c_accounting_category";
+$tabname = array();
+$tabname[32] = MAIN_DB_PREFIX."c_accounting_category";
// Dictionary labels
-$tablib=array();
-$tablib[32]= "DictionaryAccountancyCategory";
+$tablib = array();
+$tablib[32] = "DictionaryAccountancyCategory";
// Requests to extract data
-$tabsql=array();
-$tabsql[32]= "SELECT a.rowid as rowid, a.code as code, a.label, a.range_account, a.category_type, a.formula, a.position as position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accounting_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid and c.active=1";
+$tabsql = array();
+$tabsql[32] = "SELECT a.rowid as rowid, a.code as code, a.label, a.range_account, a.category_type, a.formula, a.position as position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accounting_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid and c.active=1";
// Criteria to sort dictionaries
-$tabsqlsort=array();
-$tabsqlsort[32]="position ASC";
+$tabsqlsort = array();
+$tabsqlsort[32] = "position ASC";
// Nom des champs en resultat de select pour affichage du dictionnaire
-$tabfield=array();
-$tabfield[32]= "code,label,range_account,category_type,formula,position,country";
+$tabfield = array();
+$tabfield[32] = "code,label,range_account,category_type,formula,position,country";
// Nom des champs d'edition pour modification d'un enregistrement
-$tabfieldvalue=array();
-$tabfieldvalue[32]= "code,label,range_account,category_type,formula,position,country_id";
+$tabfieldvalue = array();
+$tabfieldvalue[32] = "code,label,range_account,category_type,formula,position,country_id";
// Nom des champs dans la table pour insertion d'un enregistrement
-$tabfieldinsert=array();
-$tabfieldinsert[32]= "code,label,range_account,category_type,formula,position,fk_country";
+$tabfieldinsert = array();
+$tabfieldinsert[32] = "code,label,range_account,category_type,formula,position,fk_country";
// Nom du rowid si le champ n'est pas de type autoincrement
// Example: "" if id field is "rowid" and has autoincrement on
// "nameoffield" if id field is not "rowid" or has not autoincrement on
-$tabrowid=array();
-$tabrowid[32]= "";
+$tabrowid = array();
+$tabrowid[32] = "";
// Condition to show dictionary in setup page
-$tabcond=array();
-$tabcond[32]= ! empty($conf->accounting->enabled);
+$tabcond = array();
+$tabcond[32] = !empty($conf->accounting->enabled);
// List of help for fields
-$tabhelp=array();
+$tabhelp = array();
$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"), 'category_type'=>$langs->trans("SetToYesIfGroupIsComputationOfOtherGroups"), 'formula'=>$langs->trans("EnterCalculationRuleIfPreviousFieldIsYes"));
// List of check for fields (NOT USED YET)
-$tabfieldcheck=array();
+$tabfieldcheck = array();
$tabfieldcheck[32] = array();
// Complete all arrays with entries found into modules
@@ -125,7 +125,7 @@ complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqls
// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
$elementList = array();
-$sourceList=array();
+$sourceList = array();
@@ -141,24 +141,24 @@ if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x',
// Actions add or modify an entry into a dictionary
if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
{
- $listfield=explode(',', str_replace(' ', '', $tabfield[$id]));
- $listfieldinsert=explode(',', $tabfieldinsert[$id]);
- $listfieldmodify=explode(',', $tabfieldinsert[$id]);
- $listfieldvalue=explode(',', $tabfieldvalue[$id]);
+ $listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
+ $listfieldinsert = explode(',', $tabfieldinsert[$id]);
+ $listfieldmodify = explode(',', $tabfieldinsert[$id]);
+ $listfieldvalue = explode(',', $tabfieldvalue[$id]);
// Check that all fields are filled
- $ok=1;
+ $ok = 1;
foreach ($listfield as $f => $value)
{
if ($value == 'formula' && empty($_POST['formula'])) continue;
if ($value == 'range_account' && empty($_POST['range_account'])) continue;
if ($value == 'country' || $value == 'country_id') continue;
- if (! isset($_POST[$value]) || $_POST[$value]=='')
+ if (!isset($_POST[$value]) || $_POST[$value] == '')
{
- $ok=0;
- $fieldnamekey=$listfield[$f];
+ $ok = 0;
+ $fieldnamekey = $listfield[$f];
// We take translate key of field
- if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) $fieldnamekey='Label';
+ if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) $fieldnamekey = 'Label';
if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
@@ -170,23 +170,23 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
}
if (isset($_POST["code"]))
{
- if ($_POST["code"]=='0')
+ if ($_POST["code"] == '0')
{
- $ok=0;
+ $ok = 0;
setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
}
}
- if (! is_numeric(GETPOST('position', 'alpha')))
+ if (!is_numeric(GETPOST('position', 'alpha')))
{
$langs->loadLangs(array("errors"));
- $ok=0;
+ $ok = 0;
setEventMessages($langs->transnoentities('ErrorFieldMustBeANumeric', $langs->transnoentities("Position")), null, 'errors');
}
// Clean some parameters
- if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"]=''; // If empty, we force to null
- if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"]=''; // If empty, we force to null
- if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]=''; // If empty, we force to null
+ if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"] = ''; // If empty, we force to null
+ if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
+ if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
// Si verif ok et action add, on ajoute la ligne
if ($ok && GETPOST('actionadd', 'alpha'))
@@ -194,13 +194,13 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
if ($tabrowid[$id])
{
// Recupere id libre pour insertion
- $newid=0;
+ $newid = 0;
$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
$result = $db->query($sql);
if ($result)
{
$obj = $db->fetch_object($result);
- $newid=($obj->newid + 1);
+ $newid = ($obj->newid + 1);
} else {
dol_print_error($db);
}
@@ -209,32 +209,32 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
// Add new entry
$sql = "INSERT INTO ".$tabname[$id]." (";
// List of fields
- if ($tabrowid[$id] && ! in_array($tabrowid[$id], $listfieldinsert)) $sql.= $tabrowid[$id].",";
- $sql.= $tabfieldinsert[$id];
- $sql.=",active)";
- $sql.= " VALUES(";
+ if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) $sql .= $tabrowid[$id].",";
+ $sql .= $tabfieldinsert[$id];
+ $sql .= ",active)";
+ $sql .= " VALUES(";
// List of values
- if ($tabrowid[$id] && ! in_array($tabrowid[$id], $listfieldinsert)) $sql.= $newid.",";
- $i=0;
+ if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) $sql .= $newid.",";
+ $i = 0;
foreach ($listfieldinsert as $f => $value)
{
if ($value == 'entity') {
$_POST[$listfieldvalue[$i]] = $conf->entity;
}
- if ($i) $sql.=",";
- if ($_POST[$listfieldvalue[$i]] == '' && ! $listfieldvalue[$i] == 'formula') $sql.="null"; // For vat, we want/accept code = ''
- else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+ if ($i) $sql .= ",";
+ if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'formula') $sql .= "null"; // For vat, we want/accept code = ''
+ else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
$i++;
}
- $sql.=",1)";
+ $sql .= ",1)";
dol_syslog("actionadd", LOG_DEBUG);
$result = $db->query($sql);
if ($result) // Add is ok
{
setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
- $_POST=array('id'=>$id); // Clean $_POST array, we keep only
+ $_POST = array('id'=>$id); // Clean $_POST array, we keep only
}
else
{
@@ -250,16 +250,16 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
// Si verif ok et action modify, on modifie la ligne
if ($ok && GETPOST('actionmodify', 'alpha'))
{
- if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
- else { $rowidcol="rowid"; }
+ if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
+ else { $rowidcol = "rowid"; }
// Modify entry
$sql = "UPDATE ".$tabname[$id]." SET ";
// Modifie valeur des champs
- if ($tabrowid[$id] && ! in_array($tabrowid[$id], $listfieldmodify))
+ if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
{
- $sql.= $tabrowid[$id]."=";
- $sql.= "'".$db->escape($rowid)."', ";
+ $sql .= $tabrowid[$id]."=";
+ $sql .= "'".$db->escape($rowid)."', ";
}
$i = 0;
foreach ($listfieldmodify as $field)
@@ -270,18 +270,18 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
elseif ($field == 'entity') {
$_POST[$listfieldvalue[$i]] = $conf->entity;
}
- if ($i) $sql.=",";
- $sql.= $field."=";
- if ($_POST[$listfieldvalue[$i]] == '' && ! $listfieldvalue[$i] == 'range_account') $sql.="null"; // For range_account, we want/accept code = ''
- else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+ if ($i) $sql .= ",";
+ $sql .= $field."=";
+ if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'range_account') $sql .= "null"; // For range_account, we want/accept code = ''
+ else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
$i++;
}
- $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+ $sql .= " WHERE ".$rowidcol." = '".$rowid."'";
dol_syslog("actionmodify", LOG_DEBUG);
//print $sql;
$resql = $db->query($sql);
- if (! $resql)
+ if (!$resql)
{
setEventMessages($db->error(), null, 'errors');
}
@@ -296,14 +296,14 @@ if (GETPOST('actioncancel', 'alpha'))
if ($action == 'confirm_delete' && $confirm == 'yes') // delete
{
- if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
- else { $rowidcol="rowid"; }
+ if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
+ else { $rowidcol = "rowid"; }
$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
dol_syslog("delete", LOG_DEBUG);
$result = $db->query($sql);
- if (! $result)
+ if (!$result)
{
if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
{
@@ -319,8 +319,8 @@ if ($action == 'confirm_delete' && $confirm == 'yes') // delete
// activate
if ($action == $acts[0])
{
- if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
- else { $rowidcol="rowid"; }
+ if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
+ else { $rowidcol = "rowid"; }
if ($rowid) {
$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
@@ -339,8 +339,8 @@ if ($action == $acts[0])
// disable
if ($action == $acts[1])
{
- if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
- else { $rowidcol="rowid"; }
+ if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
+ else { $rowidcol = "rowid"; }
if ($rowid) {
$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
@@ -359,8 +359,8 @@ if ($action == $acts[1])
// favorite
if ($action == 'activate_favorite')
{
- if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
- else { $rowidcol="rowid"; }
+ if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
+ else { $rowidcol = "rowid"; }
if ($rowid) {
$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
@@ -379,8 +379,8 @@ if ($action == 'activate_favorite')
// disable favorite
if ($action == 'disable_favorite')
{
- if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
- else { $rowidcol="rowid"; }
+ if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
+ else { $rowidcol = "rowid"; }
if ($rowid) {
$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
@@ -402,13 +402,13 @@ if ($action == 'disable_favorite')
*/
$form = new Form($db);
-$formadmin=new FormAdmin($db);
+$formadmin = new FormAdmin($db);
llxHeader('', $langs->trans('DictionaryAccountancyCategory'));
-$titre=$langs->trans($tablib[$id]);
-$linkback='';
-$titlepicto='title_setup';
+$titre = $langs->trans($tablib[$id]);
+$linkback = '';
+$titlepicto = 'title_setup';
print load_fiche_titre($titre, $linkback, $titlepicto);
@@ -417,7 +417,7 @@ print ''.$langs->trans("AccountingAccountGroupsDesc"
// Confirmation de la suppression de la ligne
if ($action == 'delete')
{
- print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id.($search_country_id>0?'&search_country_id='.$search_country_id:''), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+ print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id.($search_country_id > 0 ? '&search_country_id='.$search_country_id : ''), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
}
//var_dump($elementList);
@@ -427,36 +427,36 @@ if ($action == 'delete')
if ($id)
{
// Complete requete recherche valeurs avec critere de tri
- $sql=$tabsql[$id];
+ $sql = $tabsql[$id];
if ($search_country_id > 0)
{
- if (preg_match('/ WHERE /', $sql)) $sql.= " AND ";
- else $sql.=" WHERE ";
- $sql.= " (a.fk_country = ".$search_country_id." OR a.fk_country = 0)";
+ if (preg_match('/ WHERE /', $sql)) $sql .= " AND ";
+ else $sql .= " WHERE ";
+ $sql .= " (a.fk_country = ".$search_country_id." OR a.fk_country = 0)";
}
// If sort order is "country", we use country_code instead
- if ($sortfield == 'country') $sortfield='country_code';
- $sql.=$db->order($sortfield, $sortorder);
- $sql.=$db->plimit($listlimit+1, $offset);
+ if ($sortfield == 'country') $sortfield = 'country_code';
+ $sql .= $db->order($sortfield, $sortorder);
+ $sql .= $db->plimit($listlimit + 1, $offset);
//print $sql;
- $fieldlist=explode(',', $tabfield[$id]);
+ $fieldlist = explode(',', $tabfield[$id]);
print ' |