Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

New: External modules can add dictionnaries

Browse Source
This commit is contained in:
Laurent Destailleur
2011-01-23 21:24:47 +00:00
parent a59de36362
commit 0acd16f863
2 changed files with 552 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
htdocs/admin/dict.php
View File

@@ -76,25 +76,25 @@ $tabname[18]= MAIN_DB_PREFIX."c_shipment_mode";
$tabname[19]= MAIN_DB_PREFIX."c_effectif"; $tabname[19]= MAIN_DB_PREFIX."c_effectif";
// Dictionary labels // Dictionary labels
$tablib[1] = $langs->trans("DictionnaryCompanyJuridicalType"); $tablib[1] = "DictionnaryCompanyJuridicalType";
$tablib[2] = $langs->trans("DictionnaryCanton"); $tablib[2] = "DictionnaryCanton";
$tablib[3] = $langs->trans("DictionnaryRegion"); $tablib[3] = "DictionnaryRegion";
$tablib[4] = $langs->trans("DictionnaryCountry"); $tablib[4] = "DictionnaryCountry";
$tablib[5] = $langs->trans("DictionnaryCivility"); $tablib[5] = "DictionnaryCivility";
$tablib[6] = $langs->trans("DictionnaryActions"); $tablib[6] = "DictionnaryActions";
$tablib[7] = $langs->trans("DictionnarySocialContributions"); $tablib[7] = "DictionnarySocialContributions";
$tablib[8] = $langs->trans("DictionnaryCompanyType"); $tablib[8] = "DictionnaryCompanyType";
$tablib[9] = $langs->trans("DictionnaryCurrency"); $tablib[9] = "DictionnaryCurrency";
$tablib[10]= $langs->trans("DictionnaryVAT"); $tablib[10]= "DictionnaryVAT";
$tablib[11]= $langs->trans("DictionnaryTypeContact"); $tablib[11]= "DictionnaryTypeContact";
$tablib[12]= $langs->trans("DictionnaryPaymentConditions"); $tablib[12]= "DictionnaryPaymentConditions";
$tablib[13]= $langs->trans("DictionnaryPaymentModes"); $tablib[13]= "DictionnaryPaymentModes";
$tablib[14]= $langs->trans("DictionnaryEcotaxe"); $tablib[14]= "DictionnaryEcotaxe";
$tablib[15]= $langs->trans("DictionnaryPaperFormat"); $tablib[15]= "DictionnaryPaperFormat";
$tablib[16]= $langs->trans("DictionnaryProspectLevel"); $tablib[16]= "DictionnaryProspectLevel";
$tablib[17]= $langs->trans("DictionnaryFees"); $tablib[17]= "DictionnaryFees";
$tablib[18]= $langs->trans("DictionnarySendingMethods"); $tablib[18]= "DictionnarySendingMethods";
$tablib[19]= $langs->trans("DictionnaryStaff"); $tablib[19]= "DictionnaryStaff";
// Requete pour extraction des donnees des dictionnaires // 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"; $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";
@@ -476,7 +476,7 @@ $titre=$langs->trans("DictionnarySetup");
$linkback=''; $linkback='';
if ($_GET["id"]) if ($_GET["id"])
{ {
$titre.=' - '.$tablib[$_GET["id"]]; $titre.=' - '.$langs->trans($tablib[$_GET["id"]]);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/dict.php">'.$langs->trans("BackToDictionnaryList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/dict.php">'.$langs->trans("BackToDictionnaryList").'</a>';
} }
print_fiche_titre($titre,$linkback,'setup'); print_fiche_titre($titre,$linkback,'setup');
@@ -580,7 +580,7 @@ if ($_GET["id"])
print '</td>'; print '</td>';
} }
if ($fieldlist[$field]=='libelle') $alabelisused=1; if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
} }
print '<td colspan="3">'; print '<td colspan="3">';
print '<input type="hidden" name="id" value="'.$_GET["id"].'">'; print '<input type="hidden" name="id" value="'.$_GET["id"].'">';
@@ -787,11 +787,11 @@ else
print '<tr '.$bc[$var].'><td width="30%">'; print '<tr '.$bc[$var].'><td width="30%">';
if (! empty($tabcond[$i])) if (! empty($tabcond[$i]))
{ {
print '<a href="dict.php?id='.$i.'">'.$tablib[$i].'</a>'; print '<a href="dict.php?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
} }
else else
{ {
print $tablib[$i]; print $langs->trans($tablib[$i]);
} }
print '</td>'; print '</td>';
print '<td>'; print '<td>';

14
htdocs/lib/admin.lib.php
View File

@@ -714,7 +714,7 @@ function UnActivate($value,$requiredby=1)
/** /**
* Add external modules to list of dictionnaries * Add external modules to list of dictionnaries
*/ */
function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,$tabcond) function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond)
{ {
global $db, $modules, $conf, $langs; global $db, $modules, $conf, $langs;
@@ -782,11 +782,13 @@ function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsq
//$objMod //$objMod
if (! empty($objMod->dictionnaries)) if (! empty($objMod->dictionnaries))
{ {
var_dump($tabname); //var_dump($objMod->dictionnaries['tabname']);
var_dump($objMod->dictionnaries['tabname']);
$taborder[] = 0; $taborder[] = 0;
foreach($objMod->dictionnaries['tabname'] as $val) $taborder[] = sizeof($tabname)+1; foreach($objMod->dictionnaries['tabname'] as $val)
foreach($objMod->dictionnaries['tabname'] as $val) $tabname[] = $val; {
$taborder[] = sizeof($tabname)+1;
$tabname[] = $val;
}
foreach($objMod->dictionnaries['tablib'] as $val) $tablib[] = $val; foreach($objMod->dictionnaries['tablib'] as $val) $tablib[] = $val;
foreach($objMod->dictionnaries['tabsql'] as $val) $tabsql[] = $val; foreach($objMod->dictionnaries['tabsql'] as $val) $tabsql[] = $val;
foreach($objMod->dictionnaries['tabsqlsort'] as $val) $tabsqlsort[] = $val; foreach($objMod->dictionnaries['tabsqlsort'] as $val) $tabsqlsort[] = $val;
@@ -797,7 +799,7 @@ function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsq
foreach($objMod->dictionnaries['tabcond'] as $val) $tabcond[] = $val; foreach($objMod->dictionnaries['tabcond'] as $val) $tabcond[] = $val;
// foreach($objMod->dictionnaries['tabsqlsort'] as $val) $tablib[] = $val; // foreach($objMod->dictionnaries['tabsqlsort'] as $val) $tablib[] = $val;
//$tabname = array_merge ($tabname, $objMod->dictionnaries['tabname']); //$tabname = array_merge ($tabname, $objMod->dictionnaries['tabname']);
var_dump($tabname); //var_dump($tabcond);
//exit; //exit;
} }