Skip to content

Commit

Permalink
Fix: Missing table of ordering methods in dictionnary.
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Feb 23, 2011
1 parent 51c1cfe commit 1970a5d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 2 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -72,6 +72,7 @@ For users:
readers when using "mail php function".
- Fix: When cloning commercial proposal, due date is creation date + delay
by default.
- Fix: Can edit ordering methods.

For translators:
- New: Update and complete slovenian language sl_SL.
Expand Down
14 changes: 13 additions & 1 deletion htdocs/admin/dict.php
Expand Up @@ -30,6 +30,7 @@
require("../main.inc.php");
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."/lib/admin.lib.php");

$langs->load("other");
$langs->load("admin");
Expand All @@ -51,7 +52,7 @@
// Mettre ici tous les caracteristiques des dictionnaires

// Ordres d'affichage des dictionnaires (0 pour espace)
$taborder=array(9,0,4,3,2,0,1,8,19,16,0,5,11,0,6,0,10,12,13,0,14,0,7,17,0,18,0,15);
$taborder=array(9,0,4,3,2,0,1,8,19,16,0,5,11,0,6,0,10,12,13,0,14,0,7,17,0,20,18,0,15);

// Nom des tables des dictionnaires
$tabname[1] = MAIN_DB_PREFIX."c_forme_juridique";
Expand All @@ -73,6 +74,7 @@
$tabname[17]= MAIN_DB_PREFIX."c_type_fees";
$tabname[18]= MAIN_DB_PREFIX."c_shipment_mode";
$tabname[19]= MAIN_DB_PREFIX."c_effectif";
$tabname[20]= MAIN_DB_PREFIX."c_methode_commande_fournisseur";

// Dictionary labels
$tablib[1] = $langs->trans("DictionnaryCompanyJuridicalType");
Expand All @@ -94,6 +96,7 @@
$tablib[17]= $langs->trans("DictionnaryFees");
$tablib[18]= $langs->trans("DictionnarySendingMethods");
$tablib[19]= $langs->trans("DictionnaryStaff");
$tablib[20]= $langs->trans("DictionnaryOrderMethods");

// Requete pour extraction des donnees des dictionnaires
$tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, p.code as pays_code, p.libelle as pays, f.active FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_pays as p WHERE f.fk_pays=p.rowid";
Expand All @@ -115,6 +118,7 @@
$tabsql[17]= "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_fees";
$tabsql[18]= "SELECT rowid as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_shipment_mode";
$tabsql[19]= "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_effectif";
$tabsql[20]= "SELECT rowid as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_methode_commande_fournisseur";

// Critere de tri du dictionnaire
$tabsqlsort[1] ="pays ASC, code ASC";
Expand All @@ -136,6 +140,7 @@
$tabsqlsort[17]="code ASC";
$tabsqlsort[18]="code ASC, libelle ASC";
$tabsqlsort[19]="id ASC";
$tabsqlsort[20]="code ASC, libelle ASC";

// Nom des champs en resultat de select pour affichage du dictionnaire
$tabfield[1] = "code,libelle,pays";
Expand All @@ -157,6 +162,7 @@
$tabfield[17]= "code,libelle";
$tabfield[18]= "code,libelle";
$tabfield[19]= "code,libelle";
$tabfield[20]= "code,libelle";

// Nom des champs d'edition pour modification d'un enregistrement
$tabfieldvalue[1] = "code,libelle,pays";
Expand All @@ -178,6 +184,7 @@
$tabfieldvalue[17]= "code,libelle";
$tabfieldvalue[18]= "code,libelle";
$tabfieldvalue[19]= "code,libelle";
$tabfieldvalue[20]= "code,libelle";

// Nom des champs dans la table pour insertion d'un enregistrement
$tabfieldinsert[1] = "code,libelle,fk_pays";
Expand All @@ -199,8 +206,11 @@
$tabfieldinsert[17]= "code,libelle";
$tabfieldinsert[18]= "code,libelle";
$tabfieldinsert[19]= "code,libelle";
$tabfieldinsert[20]= "code,libelle";

// 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[1] = "";
$tabrowid[2] = "";
$tabrowid[3] = "";
Expand All @@ -220,6 +230,7 @@
$tabrowid[17]= "id";
$tabrowid[18]= "rowid";
$tabrowid[19]= "id";
$tabrowid[20]= "";

// Condition to show dictionnary in setup page
$tabcond[1] = true;
Expand All @@ -241,6 +252,7 @@
$tabcond[17]= $conf->deplacement->enabled;
$tabcond[18]= $conf->expedition->enabled;
$tabcond[19]= $conf->societe->enabled;
$tabcond[20]= $conf->fournisseur->enabled;

$msg='';

Expand Down
3 changes: 2 additions & 1 deletion htdocs/langs/en_US/admin.lang
Expand Up @@ -625,8 +625,9 @@ DictionnaryTypeContact=Contact types
DictionnaryEcotaxe=Ecotax (WEEE)
DictionnaryPaperFormat=Paper formats
DictionnaryFees=Type of fees
DictionnarySendingMethods=Sendings methods
DictionnarySendingMethods=Shipping methods
DictionnaryStaff=Staff
DictionnaryOrderMethods=Ordering methods
SetupSaved=Setup saved
BackToModuleList=Back to modules list
BackToDictionnaryList=Back to dictionaries list
Expand Down
1 change: 1 addition & 0 deletions htdocs/langs/fr_FR/admin.lang
Expand Up @@ -635,6 +635,7 @@ DictionnaryPaperFormat= Format papiers
DictionnaryFees= Types de déplacement et notes de frais
DictionnarySendingMethods= Méthodes d'expédition
DictionnaryStaff= Effectifs
DictionnaryOrderMethods=Méthodes de commandes
SetupSaved= Configuration sauvegardée
BackToModuleList= Retour liste des modules
BackToDictionnaryList= Retour liste des dictionnaires
Expand Down

0 comments on commit 1970a5d

Please sign in to comment.