|
|
@@ -22,147 +22,737 @@
|
|
|
* \brief Setup page to configure journals
|
|
|
*/
|
|
|
require '../../main.inc.php';
|
|
|
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
|
|
|
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
|
|
|
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
|
|
|
-
|
|
|
-$action = GETPOST('action');
|
|
|
-
|
|
|
-// Load variable for pagination
|
|
|
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
|
|
|
-$sortfield = GETPOST('sortfield','alpha');
|
|
|
-$sortorder = GETPOST('sortorder','alpha');
|
|
|
-$page = GETPOST('page','int');
|
|
|
-if ($page == -1) { $page = 0; }
|
|
|
-$offset = $limit * $page;
|
|
|
-$pageprev = $page - 1;
|
|
|
-$pagenext = $page + 1;
|
|
|
-if (! $sortfield) $sortfield="j.rowid"; // Set here default search field
|
|
|
-if (! $sortorder) $sortorder="ASC";
|
|
|
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
|
|
|
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
|
|
|
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
|
|
|
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
|
|
|
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
|
|
|
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
|
|
|
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
|
|
|
|
|
|
$langs->load("admin");
|
|
|
$langs->load("compta");
|
|
|
$langs->load("accountancy");
|
|
|
|
|
|
-// Security check
|
|
|
-if ($user->societe_id > 0)
|
|
|
+$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
|
|
|
+$confirm=GETPOST('confirm','alpha');
|
|
|
+$id=GETPOST('id','int');
|
|
|
+$rowid=GETPOST('rowid','alpha');
|
|
|
+
|
|
|
+// Security access
|
|
|
+if (! empty($user->rights->accountancy->chartofaccount))
|
|
|
+{
|
|
|
accessforbidden();
|
|
|
-if (! $user->rights->accounting->fiscalyear) // If we can read accounting records, we shoul be able to see fiscal year.
|
|
|
- accessforbidden();
|
|
|
-
|
|
|
+}
|
|
|
+
|
|
|
+$acts[0] = "activate";
|
|
|
+$acts[1] = "disable";
|
|
|
+$actl[0] = img_picto($langs->trans("Disabled"),'switch_off');
|
|
|
+$actl[1] = img_picto($langs->trans("Activated"),'switch_on');
|
|
|
+
|
|
|
+$listoffset=GETPOST('listoffset');
|
|
|
+$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
|
|
|
+$active = 1;
|
|
|
+
|
|
|
+$sortfield = GETPOST("sortfield",'alpha');
|
|
|
+$sortorder = GETPOST("sortorder",'alpha');
|
|
|
+$page = GETPOST("page",'int');
|
|
|
+if ($page == -1) { $page = 0 ; }
|
|
|
+$offset = $listlimit * $page ;
|
|
|
+$pageprev = $page - 1;
|
|
|
+$pagenext = $page + 1;
|
|
|
+
|
|
|
$error = 0;
|
|
|
|
|
|
-// List of status
|
|
|
-/*
|
|
|
-static $tmptype2label = array (
|
|
|
- '0' => 'AccountingJournalTypeVariousOperation',
|
|
|
- '1' => 'AccountingJournalTypeSale',
|
|
|
- '2' => 'AccountingJournalTypePurchase',
|
|
|
- '3' => 'AccountingJournalTypeBank',
|
|
|
- '9' => 'AccountingJournalTypeHasNew'
|
|
|
-);
|
|
|
-$type2label = array (
|
|
|
- ''
|
|
|
-);
|
|
|
-foreach ( $tmptype2label as $key => $val )
|
|
|
- $type2label[$key] = $langs->trans($val);
|
|
|
-*/
|
|
|
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
|
|
|
+$hookmanager->initHooks(array('admin'));
|
|
|
+
|
|
|
+// This page is a generic page to edit dictionaries
|
|
|
+// 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(35);
|
|
|
+
|
|
|
+// Name of SQL tables of dictionaries
|
|
|
+$tabname=array();
|
|
|
+$tabname[35]= MAIN_DB_PREFIX."accounting_journal";
|
|
|
|
|
|
-$errors = array ();
|
|
|
+// Dictionary labels
|
|
|
+$tablib=array();
|
|
|
+$tablib[35]= "DictionaryAccountancyJournal";
|
|
|
|
|
|
-$object = new AccountingJournal($db);
|
|
|
+// Requests to extract data
|
|
|
+$tabsql=array();
|
|
|
+$tabsql[35]= "SELECT a.rowid as rowid, a.code as code, a.label, a.nature, a.active FROM ".MAIN_DB_PREFIX."accounting_journal as a";
|
|
|
|
|
|
+// Criteria to sort dictionaries
|
|
|
+$tabsqlsort=array();
|
|
|
+$tabsqlsort[35]="code ASC";
|
|
|
+
|
|
|
+// Nom des champs en resultat de select pour affichage du dictionnaire
|
|
|
+$tabfield=array();
|
|
|
+$tabfield[35]= "code,label,nature";
|
|
|
+
|
|
|
+// Nom des champs d'edition pour modification d'un enregistrement
|
|
|
+$tabfieldvalue=array();
|
|
|
+$tabfieldvalue[35]= "code,label,nature";
|
|
|
+
|
|
|
+// Nom des champs dans la table pour insertion d'un enregistrement
|
|
|
+$tabfieldinsert=array();
|
|
|
+$tabfieldinsert[35]= "code,label,nature";
|
|
|
+
|
|
|
+// 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[35]= "";
|
|
|
+
|
|
|
+// Condition to show dictionary in setup page
|
|
|
+$tabcond=array();
|
|
|
+$tabcond[35]= ! empty($conf->accounting->enabled);
|
|
|
+
|
|
|
+// List of help for fields
|
|
|
+$tabhelp=array();
|
|
|
+$tabhelp[35] = array('code'=>$langs->trans("EnterAnyCode"));
|
|
|
+
|
|
|
+// List of check for fields (NOT USED YET)
|
|
|
+$tabfieldcheck=array();
|
|
|
+$tabfieldcheck[35] = array();
|
|
|
+
|
|
|
+// Complete all arrays with entries found into modules
|
|
|
+complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck);
|
|
|
+
|
|
|
+
|
|
|
+// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
|
|
|
+$elementList = array();
|
|
|
+ $sourceList = array(
|
|
|
+ '1' => $langs->trans('AccountingJournalType0'),
|
|
|
+ '2' => $langs->trans('AccountingJournalType1'),
|
|
|
+ '3' => $langs->trans('AccountingJournalType2'),
|
|
|
+ '4' => $langs->trans('AccountingJournalType3'),
|
|
|
+ '9' => $langs->trans('AccountingJournalType9')
|
|
|
+ );
|
|
|
|
|
|
/*
|
|
|
* Actions
|
|
|
*/
|
|
|
|
|
|
+if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
|
|
|
+{
|
|
|
+ $search_country_id = '';
|
|
|
+}
|
|
|
+
|
|
|
+// Actions add or modify an entry into a dictionary
|
|
|
+if (GETPOST('actionadd') || GETPOST('actionmodify'))
|
|
|
+{
|
|
|
+ $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;
|
|
|
+ foreach ($listfield as $f => $value)
|
|
|
+ {
|
|
|
+ if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) $fieldnamekey='Label';
|
|
|
+ if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
|
|
|
+ if ($fieldnamekey == 'nature') $fieldnamekey = 'Nature';
|
|
|
+ }
|
|
|
+ // Other checks
|
|
|
+ if (isset($_POST["code"]))
|
|
|
+ {
|
|
|
+ if ($_POST["code"]=='0')
|
|
|
+ {
|
|
|
+ $ok=0;
|
|
|
+ setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
|
|
|
+ }
|
|
|
+ /*if (!is_numeric($_POST['code'])) // disabled, code may not be in numeric base
|
|
|
+ {
|
|
|
+ $ok = 0;
|
|
|
+ $msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
|
|
|
+ }*/
|
|
|
+ }
|
|
|
+
|
|
|
+ // 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
|
|
|
+
|
|
|
+ // Si verif ok et action add, on ajoute la ligne
|
|
|
+ if ($ok && GETPOST('actionadd'))
|
|
|
+ {
|
|
|
+ if ($tabrowid[$id])
|
|
|
+ {
|
|
|
+ // Recupere id libre pour insertion
|
|
|
+ $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);
|
|
|
+
|
|
|
+ } else {
|
|
|
+ dol_print_error($db);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // 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(";
|
|
|
+
|
|
|
+ // List of values
|
|
|
+ if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
|
|
|
+ $sql.= $newid.",";
|
|
|
+ $i=0;
|
|
|
+ foreach ($listfieldinsert as $f => $value)
|
|
|
+ {
|
|
|
+ if ($value == 'price' || preg_match('/^amount/i',$value) || $value == 'taux') {
|
|
|
+ $_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
|
|
|
+ }
|
|
|
+ else if ($value == 'entity') {
|
|
|
+ $_POST[$listfieldvalue[$i]] = $conf->entity;
|
|
|
+ }
|
|
|
+ if ($i) $sql.=",";
|
|
|
+ if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null"; // For vat, we want/accept code = ''
|
|
|
+ else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
|
|
|
+ $i++;
|
|
|
+ }
|
|
|
+ $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
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
|
|
|
+ setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ dol_print_error($db);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // Si verif ok et action modify, on modifie la ligne
|
|
|
+ if ($ok && GETPOST('actionmodify'))
|
|
|
+ {
|
|
|
+ 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))
|
|
|
+ {
|
|
|
+ $sql.= $tabrowid[$id]."=";
|
|
|
+ $sql.= "'".$db->escape($rowid)."', ";
|
|
|
+ }
|
|
|
+ $i = 0;
|
|
|
+ foreach ($listfieldmodify as $field)
|
|
|
+ {
|
|
|
+ if ($field == 'price' || preg_match('/^amount/i',$field) || $field == 'taux') {
|
|
|
+ $_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
|
|
|
+ }
|
|
|
+ else if ($field == 'entity') {
|
|
|
+ $_POST[$listfieldvalue[$i]] = $conf->entity;
|
|
|
+ }
|
|
|
+ if ($i) $sql.=",";
|
|
|
+ $sql.= $field."=";
|
|
|
+ if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null"; // For vat, we want/accept code = ''
|
|
|
+ else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
|
|
|
+ $i++;
|
|
|
+ }
|
|
|
+ $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
|
|
|
+
|
|
|
+ dol_syslog("actionmodify", LOG_DEBUG);
|
|
|
+ //print $sql;
|
|
|
+ $resql = $db->query($sql);
|
|
|
+ if (! $resql)
|
|
|
+ {
|
|
|
+ setEventMessages($db->error(), null, 'errors');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition
|
|
|
+}
|
|
|
+
|
|
|
+if (GETPOST('actioncancel'))
|
|
|
+{
|
|
|
+ //$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition
|
|
|
+}
|
|
|
+
|
|
|
+if ($action == 'confirm_delete' && $confirm == 'yes') // delete
|
|
|
+{
|
|
|
+ if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
|
|
|
+ else { $rowidcol="rowid"; }
|
|
|
+
|
|
|
+ $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
|
|
|
+
|
|
|
+ dol_syslog("delete", LOG_DEBUG);
|
|
|
+ $result = $db->query($sql);
|
|
|
+ if (! $result)
|
|
|
+ {
|
|
|
+ if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
|
|
|
+ {
|
|
|
+ setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ dol_print_error($db);
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+// activate
|
|
|
+if ($action == $acts[0])
|
|
|
+{
|
|
|
+ if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
|
|
|
+ else { $rowidcol="rowid"; }
|
|
|
+
|
|
|
+ if ($rowid) {
|
|
|
+ $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
|
|
|
+ }
|
|
|
+ elseif ($_GET["code"]) {
|
|
|
+ $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$_GET["code"]."'";
|
|
|
+ }
|
|
|
+
|
|
|
+ $result = $db->query($sql);
|
|
|
+ if (!$result)
|
|
|
+ {
|
|
|
+ dol_print_error($db);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+// disable
|
|
|
+if ($action == $acts[1])
|
|
|
+{
|
|
|
+ if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
|
|
|
+ else { $rowidcol="rowid"; }
|
|
|
+
|
|
|
+ if ($rowid) {
|
|
|
+ $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
|
|
|
+ }
|
|
|
+ elseif ($_GET["code"]) {
|
|
|
+ $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$_GET["code"]."'";
|
|
|
+ }
|
|
|
+
|
|
|
+ $result = $db->query($sql);
|
|
|
+ if (!$result)
|
|
|
+ {
|
|
|
+ dol_print_error($db);
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
/*
|
|
|
* View
|
|
|
*/
|
|
|
-$title = $langs->trans('AccountingJournals');
|
|
|
-$helpurl = "";
|
|
|
-llxHeader('', $title, $helpurl);
|
|
|
|
|
|
-$max = 100;
|
|
|
$form = new Form($db);
|
|
|
+$formadmin=new FormAdmin($db);
|
|
|
|
|
|
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
|
|
|
-print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
|
|
|
-
|
|
|
-$head = admin_accounting_prepare_head(null);
|
|
|
+llxHeader();
|
|
|
|
|
|
-dol_fiche_head($head, 'journal', $langs->trans("Configuration"), -1, 'cron');
|
|
|
-
|
|
|
-$sql = "SELECT j.rowid, j.code, j.label, j.nature, j.active";
|
|
|
-$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_journal as j";
|
|
|
-// $sql .= " WHERE j.entity = " . $conf->entity;
|
|
|
-$sql.=$db->order($sortfield,$sortorder);
|
|
|
-
|
|
|
-// Count total nb of records
|
|
|
-$nbtotalofrecords = '';
|
|
|
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
|
|
|
+$titre=$langs->trans("DictionarySetup");
|
|
|
+$linkback='';
|
|
|
+if ($id)
|
|
|
{
|
|
|
- $result = $db->query($sql);
|
|
|
- $nbtotalofrecords = $db->num_rows($result);
|
|
|
+ $titre.=' - '.$langs->trans($tablib[$id]);
|
|
|
+ $titlepicto='title_accountancy';
|
|
|
}
|
|
|
|
|
|
-$sql.= $db->plimit($limit+1, $offset);
|
|
|
-
|
|
|
-$result = $db->query($sql);
|
|
|
-if ($result) {
|
|
|
- $num = $db->num_rows($result);
|
|
|
-
|
|
|
- $i = 0;
|
|
|
-
|
|
|
- // $title = $langs->trans('AccountingJournals');
|
|
|
- // print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit, 1);
|
|
|
-
|
|
|
- // Load attribute_label
|
|
|
- print '<table class="noborder" width="100%">';
|
|
|
- print '<tr class="liste_titre">';
|
|
|
- // print '<td>' . $langs->trans("Ref") . '</td>';
|
|
|
- print '<td>' . $langs->trans("Code") . '</td>';
|
|
|
- print '<td>' . $langs->trans("Label") . '</td>';
|
|
|
- print '<td>' . $langs->trans("Nature") . '</td>';
|
|
|
- print '</tr>';
|
|
|
-
|
|
|
- if ($num) {
|
|
|
- $accountingjournalstatic = new AccountingJournal($db);
|
|
|
-
|
|
|
- while ( $i < $num && $i < $max ) {
|
|
|
- $obj = $db->fetch_object($result);
|
|
|
- $accountingjournalstatic->id = $obj->rowid;
|
|
|
- print '<tr class="oddeven">';
|
|
|
- print '<td><a href="journals_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowJournal"), "technic") . ' ' . $obj->code . '</a></td>';
|
|
|
- print '<td align="left">' . $obj->label . '</td>';
|
|
|
- print '<td>' . $accountingjournalstatic->LibType($obj->nature, 0) . '</td>';
|
|
|
- print '</tr>';
|
|
|
- $i ++;
|
|
|
- }
|
|
|
- } else {
|
|
|
- print '<tr class="oddeven"><td colspan="3" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
|
|
|
- }
|
|
|
- print '</table>';
|
|
|
-} else {
|
|
|
- dol_print_error($db);
|
|
|
+print load_fiche_titre($titre,$linkback,$titlepicto);
|
|
|
+
|
|
|
+if (empty($id))
|
|
|
+{
|
|
|
+ print $langs->trans("DictionaryDesc");
|
|
|
+ print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
|
|
|
}
|
|
|
+print "<br>\n";
|
|
|
|
|
|
-dol_fiche_end();
|
|
|
|
|
|
-// Buttons
|
|
|
-print '<div class="tabsAction">';
|
|
|
-if (! empty($user->rights->accounting->chartofaccount))
|
|
|
+// Confirmation de la suppression de la ligne
|
|
|
+if ($action == 'delete')
|
|
|
{
|
|
|
- print '<a class="butAction" href="journals_card.php?action=create">' . $langs->trans("NewAccountingJournal") . '</a>';
|
|
|
+ print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$_GET["code"].'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
|
|
|
}
|
|
|
-else
|
|
|
+//var_dump($elementList);
|
|
|
+
|
|
|
+/*
|
|
|
+ * Show a dictionary
|
|
|
+ */
|
|
|
+if ($id)
|
|
|
{
|
|
|
- print '<a class="butActionRefused" href="#">' . $langs->trans("NewAccountingJournal") . '</a>';
|
|
|
+ // Complete requete recherche valeurs avec critere de tri
|
|
|
+ $sql=$tabsql[$id];
|
|
|
+
|
|
|
+ if ($search_country_id > 0)
|
|
|
+ {
|
|
|
+ if (preg_match('/ WHERE /',$sql)) $sql.= " AND ";
|
|
|
+ else $sql.=" WHERE ";
|
|
|
+ $sql.= " c.rowid = ".$search_country_id;
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($sortfield)
|
|
|
+ {
|
|
|
+ // If sort order is "country", we use country_code instead
|
|
|
+ if ($sortfield == 'country') $sortfield='country_code';
|
|
|
+ $sql.= " ORDER BY ".$sortfield;
|
|
|
+ if ($sortorder)
|
|
|
+ {
|
|
|
+ $sql.=" ".strtoupper($sortorder);
|
|
|
+ }
|
|
|
+ $sql.=", ";
|
|
|
+ // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
|
|
|
+ $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
|
|
|
+ $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ $sql.=" ORDER BY ";
|
|
|
+ }
|
|
|
+ $sql.=$tabsqlsort[$id];
|
|
|
+ $sql.=$db->plimit($listlimit+1,$offset);
|
|
|
+ //print $sql;
|
|
|
+
|
|
|
+ $fieldlist=explode(',',$tabfield[$id]);
|
|
|
+
|
|
|
+ print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
|
|
|
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
|
|
+ print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
|
|
|
+
|
|
|
+ print '<table class="noborder" width="100%">';
|
|
|
+
|
|
|
+ // Form to add a new line
|
|
|
+ if ($tabname[$id])
|
|
|
+ {
|
|
|
+ $alabelisused=0;
|
|
|
+ $var=false;
|
|
|
+
|
|
|
+ $fieldlist=explode(',',$tabfield[$id]);
|
|
|
+
|
|
|
+ // Line for title
|
|
|
+ print '<tr class="liste_titre">';
|
|
|
+ foreach ($fieldlist as $field => $value)
|
|
|
+ {
|
|
|
+ // Determine le nom du champ par rapport aux noms possibles
|
|
|
+ // dans les dictionnaires de donnees
|
|
|
+ $valuetoshow=ucfirst($fieldlist[$field]); // Par defaut
|
|
|
+ $valuetoshow=$langs->trans($valuetoshow); // try to translate
|
|
|
+ $align="left";
|
|
|
+ if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
|
|
|
+ if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
|
|
|
+ {
|
|
|
+ $valuetoshow=$langs->trans("Label");
|
|
|
+ }
|
|
|
+ if ($fieldlist[$field]=='nature') { $valuetoshow=$langs->trans("Nature"); }
|
|
|
+
|
|
|
+ if ($valuetoshow != '')
|
|
|
+ {
|
|
|
+ print '<td align="'.$align.'">';
|
|
|
+ if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
|
|
|
+ else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
|
|
|
+ else print $valuetoshow;
|
|
|
+ print '</td>';
|
|
|
+ }
|
|
|
+ if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($id == 4) print '<td></td>';
|
|
|
+ print '<td>';
|
|
|
+ print '<input type="hidden" name="id" value="'.$id.'">';
|
|
|
+ print '</td>';
|
|
|
+ print '<td style="min-width: 26px;"></td>';
|
|
|
+ print '<td style="min-width: 26px;"></td>';
|
|
|
+ print '<td style="min-width: 26px;"></td>';
|
|
|
+ print '</tr>';
|
|
|
+
|
|
|
+ // Line to enter new values
|
|
|
+ print "<tr ".$bcnd[$var].">";
|
|
|
+
|
|
|
+ $obj = new stdClass();
|
|
|
+ // If data was already input, we define them in obj to populate input fields.
|
|
|
+ if (GETPOST('actionadd'))
|
|
|
+ {
|
|
|
+ foreach ($fieldlist as $key=>$val)
|
|
|
+ {
|
|
|
+ if (GETPOST($val) != '')
|
|
|
+ $obj->$val=GETPOST($val);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ $tmpaction = 'create';
|
|
|
+ $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
|
|
|
+ $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
|
|
|
+ $error=$hookmanager->error; $errors=$hookmanager->errors;
|
|
|
+
|
|
|
+ if (empty($reshook))
|
|
|
+ {
|
|
|
+ fieldList($fieldlist,$obj,$tabname[$id],'add');
|
|
|
+ }
|
|
|
+
|
|
|
+ print '<td colspan="4" align="right">';
|
|
|
+ print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
|
|
|
+ print '</td>';
|
|
|
+ print "</tr>";
|
|
|
+
|
|
|
+ $colspan=count($fieldlist)+3;
|
|
|
+
|
|
|
+ if (! empty($alabelisused)) // If there is one label among fields, we show legend of *
|
|
|
+ {
|
|
|
+ print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
|
|
|
+ }
|
|
|
+ print '<tr><td colspan="'.$colspan.'"> </td></tr>'; // Keep to have a line with enough height
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ // List of available record in database
|
|
|
+ dol_syslog("htdocs/admin/dict", LOG_DEBUG);
|
|
|
+ $resql=$db->query($sql);
|
|
|
+ if ($resql)
|
|
|
+ {
|
|
|
+ $num = $db->num_rows($resql);
|
|
|
+ $i = 0;
|
|
|
+ $var=true;
|
|
|
+
|
|
|
+ $param = '&id='.$id;
|
|
|
+ if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
|
|
|
+ $paramwithsearch = $param;
|
|
|
+ if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
|
|
|
+ if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
|
|
|
+ if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
|
|
|
+
|
|
|
+ // There is several pages
|
|
|
+ if ($num > $listlimit)
|
|
|
+ {
|
|
|
+ print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
|
|
|
+ print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
|
|
|
+ print '</td></tr>';
|
|
|
+ }
|
|
|
+
|
|
|
+ // Title of lines
|
|
|
+ print '<tr class="liste_titre liste_titre_add">';
|
|
|
+ foreach ($fieldlist as $field => $value)
|
|
|
+ {
|
|
|
+ // Determine le nom du champ par rapport aux noms possibles
|
|
|
+ // dans les dictionnaires de donnees
|
|
|
+ $showfield=1; // By defaut
|
|
|
+ $align="left";
|
|
|
+ $sortable=1;
|
|
|
+ $valuetoshow='';
|
|
|
+ /*
|
|
|
+ $tmparray=getLabelOfField($fieldlist[$field]);
|
|
|
+ $showfield=$tmp['showfield'];
|
|
|
+ $valuetoshow=$tmp['valuetoshow'];
|
|
|
+ $align=$tmp['align'];
|
|
|
+ $sortable=$tmp['sortable'];
|
|
|
+ */
|
|
|
+ $valuetoshow=ucfirst($fieldlist[$field]); // By defaut
|
|
|
+ $valuetoshow=$langs->trans($valuetoshow); // try to translate
|
|
|
+ if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
|
|
|
+ if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
|
|
|
+ if ($fieldlist[$field]=='nature') { $valuetoshow=$langs->trans("Nature"); }
|
|
|
+
|
|
|
+ // Affiche nom du champ
|
|
|
+ if ($showfield)
|
|
|
+ {
|
|
|
+ print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
|
|
|
+ print getTitleFieldOfList('');
|
|
|
+ print getTitleFieldOfList('');
|
|
|
+ print getTitleFieldOfList('');
|
|
|
+ print '</tr>';
|
|
|
+
|
|
|
+ // Title line with search boxes
|
|
|
+ print '<tr class="liste_titre_filter">';
|
|
|
+ print '<td class="liste_titre"></td>';
|
|
|
+ print '<td class="liste_titre"></td>';
|
|
|
+ print '<td class="liste_titre"></td>';
|
|
|
+ print '<td class="liste_titre" align="center">';
|
|
|
+ if ($filterfound)
|
|
|
+ {
|
|
|
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
|
|
|
+ print $searchpitco;
|
|
|
+ }
|
|
|
+ print '</td>';
|
|
|
+ print '</tr>';
|
|
|
+
|
|
|
+ if ($num)
|
|
|
+ {
|
|
|
+ // Lines with values
|
|
|
+ while ($i < $num)
|
|
|
+ {
|
|
|
+ $obj = $db->fetch_object($resql);
|
|
|
+ //print_r($obj);
|
|
|
+ print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
|
|
|
+ if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
|
|
|
+ {
|
|
|
+ $tmpaction='edit';
|
|
|
+ $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
|
|
|
+ $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
|
|
|
+ $error=$hookmanager->error; $errors=$hookmanager->errors;
|
|
|
+
|
|
|
+ // Show fields
|
|
|
+ if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
|
|
|
+
|
|
|
+ print '<td></td>';
|
|
|
+ print '<td></td>';
|
|
|
+ print '<td align="center">';
|
|
|
+ print '<input type="hidden" name="page" value="'.$page.'">';
|
|
|
+ print '<input type="hidden" name="rowid" value="'.$rowid.'">';
|
|
|
+ print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
|
|
|
+ print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
|
|
|
+ print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
|
|
|
+ print '</td>';
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ $tmpaction = 'view';
|
|
|
+ $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
|
|
|
+ $reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
|
|
|
+
|
|
|
+ $error=$hookmanager->error; $errors=$hookmanager->errors;
|
|
|
+
|
|
|
+ if (empty($reshook))
|
|
|
+ {
|
|
|
+ foreach ($fieldlist as $field => $value)
|
|
|
+ {
|
|
|
+
|
|
|
+ $showfield=1;
|
|
|
+ $align="left";
|
|
|
+ $valuetoshow=$obj->{$fieldlist[$field]};
|
|
|
+ if ($valuetoshow=='all') {
|
|
|
+ $valuetoshow=$langs->trans('All');
|
|
|
+ }
|
|
|
+ else if ($fieldlist[$field]=='nature' && $tabname[$id]==MAIN_DB_PREFIX.'accounting_journal') {
|
|
|
+ $langs->load("accountancy");
|
|
|
+ $key=$langs->trans("AccountingJournalType".strtoupper($obj->nature));
|
|
|
+ $valuetoshow=($obj->nature && $key != "AccountingJournalType".strtoupper($obj->nature)?$key:$obj->{$fieldlist[$field]});
|
|
|
+ }
|
|
|
+
|
|
|
+ $class='tddict';
|
|
|
+ // Show value for field
|
|
|
+ if ($showfield) print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // Can an entry be erased or disabled ?
|
|
|
+ $iserasable=1;$canbedisabled=1;$canbemodified=1; // true by default
|
|
|
+ if (isset($obj->code) && $id != 10)
|
|
|
+ {
|
|
|
+ if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $canbedisabled = 0; }
|
|
|
+ else if ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
|
|
|
+ else if ($obj->code == 'EF0') { $iserasable = 0; $canbedisabled = 0; }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable=0; }
|
|
|
+ if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled=0; $canbedisabled = 0; }
|
|
|
+ $canbemodified=$iserasable;
|
|
|
+ if ($obj->code == 'RECEP') $canbemodified=1;
|
|
|
+
|
|
|
+ $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
|
|
|
+ if ($param) $url .= '&'.$param;
|
|
|
+ $url.='&';
|
|
|
+
|
|
|
+ // Active
|
|
|
+ print '<td align="center" class="nowrap">';
|
|
|
+ if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
|
|
|
+ else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
|
|
|
+ else if (isset($obj->type) && in_array($obj->type, array('system')) && ! empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
|
|
|
+ else print $langs->trans("AlwaysActive");
|
|
|
+ }
|
|
|
+ print "</td>";
|
|
|
+
|
|
|
+ // Modify link
|
|
|
+ if ($canbemodified) print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
|
|
|
+ else print '<td> </td>';
|
|
|
+
|
|
|
+ // Delete link
|
|
|
+ if ($iserasable)
|
|
|
+ {
|
|
|
+ print '<td align="center">';
|
|
|
+ if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
|
|
|
+ //else print '<a href="#">'.img_delete().'</a>'; // Some dictionnary can be edited by other profile than admin
|
|
|
+ print '</td>';
|
|
|
+ }
|
|
|
+ else print '<td> </td>';
|
|
|
+
|
|
|
+ print '</td>';
|
|
|
+ print "</tr>\n";
|
|
|
+ }
|
|
|
+ $i++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ dol_print_error($db);
|
|
|
+ }
|
|
|
+
|
|
|
+ print '</table>';
|
|
|
+
|
|
|
+ print '</form>';
|
|
|
}
|
|
|
-print '</div>';
|
|
|
+
|
|
|
+print '<br>';
|
|
|
+
|
|
|
|
|
|
llxFooter();
|
|
|
-$db->close();
|
|
|
+$db->close();
|
|
|
+
|
|
|
+
|
|
|
+/**
|
|
|
+ * Show fields in insert/edit mode
|
|
|
+ *
|
|
|
+ * @param array $fieldlist Array of fields
|
|
|
+ * @param Object $obj If we show a particular record, obj is filled with record fields
|
|
|
+ * @param string $tabname Name of SQL table
|
|
|
+ * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
|
|
|
+ * @return void
|
|
|
+ */
|
|
|
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
|
|
|
+{
|
|
|
+ global $conf,$langs,$db;
|
|
|
+ global $form, $mysoc;
|
|
|
+ global $region_id;
|
|
|
+ global $elementList,$sourceList,$localtax_typeList;
|
|
|
+ global $bc;
|
|
|
+
|
|
|
+ $formadmin = new FormAdmin($db);
|
|
|
+ $formcompany = new FormCompany($db);
|
|
|
+
|
|
|
+ foreach ($fieldlist as $field => $value)
|
|
|
+ {
|
|
|
+ if ($fieldlist[$field] == 'nature')
|
|
|
+ {
|
|
|
+ print '<td>';
|
|
|
+ print $form->selectarray('nature', $sourceList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
|
|
|
+ print '</td>';
|
|
|
+ }
|
|
|
+ elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
|
|
|
+ print '<td><input type="text" class="flat minwidth100" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ print '<td>';
|
|
|
+ $size=''; $class='';
|
|
|
+ if ($fieldlist[$field]=='code') $class='maxwidth100';
|
|
|
+ if ($fieldlist[$field]=='label') $class='quatrevingtpercent';
|
|
|
+ if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $size='size="2" ';
|
|
|
+ print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
|
|
|
+ print '</td>';
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
Alexandre SPANGARO