lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into typo-spanish-translation

Browse Source 
Conflicts:
	htdocs/langs/es_ES/products.lang
This commit is contained in:
Marcos García 2012-07-28 16:31:34 +02:00
commit f9dbc6d9be
80 changed files with 2959 additions and 2781 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -27,6 +27,8 @@ For users:
- New: Can correct stock of a warehouse from warehouse card. - New: Can correct stock of a warehouse from warehouse card.
- New: [ task #454 ] Add "No category" into filters on category. - New: [ task #454 ] Add "No category" into filters on category.
- New: Update language files (de, tr, pt). - New: Update language files (de, tr, pt).
- New: Auto check box on page to edit interface options of user.
- New: Add great britain provinces.
- Fix: No images into product description lines as PDF generation does - Fix: No images into product description lines as PDF generation does
not work with this. not work with this.

3
dev/codesniffer/ruleset.xml
View File

@ -108,6 +108,9 @@
<rule ref="Generic.NamingConventions.UpperCaseConstantName" /> <rule ref="Generic.NamingConventions.UpperCaseConstantName" />
<rule ref="Generic.PHP.DeprecatedFunctions" /> <rule ref="Generic.PHP.DeprecatedFunctions" />
<rule ref="Generic.PHP.DeprecatedFunctions.Deprecated">
<severity>0</severity>
</rule>
<rule ref="Generic.PHP.DisallowShortOpenTag" /> <rule ref="Generic.PHP.DisallowShortOpenTag" />

4
htdocs/adherents/admin/mailman.php
View File

@ -178,7 +178,7 @@ if ($conf->global->ADHERENT_USE_MAILMAN)
'ADHERENT_MAILMAN_LISTS' 'ADHERENT_MAILMAN_LISTS'
); );
print_fiche_titre("Mailman mailing list system",$lien,''); print_fiche_titre($langs->trans('MailmanTitle'), $lien,'');
// JQuery activity // JQuery activity
print '<script type="text/javascript"> print '<script type="text/javascript">
@ -209,7 +209,7 @@ else
//$lien.=img_$langs->trans("Activate") //$lien.=img_$langs->trans("Activate")
$lien.=img_picto($langs->trans("Disabled"),'switch_off'); $lien.=img_picto($langs->trans("Disabled"),'switch_off');
$lien.='</a>'; $lien.='</a>';
print_fiche_titre("Mailman mailing list system",$lien,''); print_fiche_titre($langs->trans('MailmanTitle'), $lien,'');
} }
dol_fiche_end(); dol_fiche_end();

21
htdocs/adherents/liste.php
View File

@ -41,7 +41,8 @@ $search_prenom=GETPOST("search_prenom");
$search_login=GETPOST("search_login"); $search_login=GETPOST("search_login");
$type=GETPOST("type"); $type=GETPOST("type");
$search_email=GETPOST("search_email"); $search_email=GETPOST("search_email");
$search_categ=GETPOST("search_categ"); $search_categ = GETPOST("search_categ",'int');
$catid = GETPOST("catid",'int');
$sall=GETPOST("sall"); $sall=GETPOST("sall");
$sortfield = GETPOST("sortfield",'alpha'); $sortfield = GETPOST("sortfield",'alpha');
@ -64,6 +65,7 @@ if (GETPOST("button_removefilter"))
$type=""; $type="";
$search_email=""; $search_email="";
$search_categ=""; $search_categ="";
$catid="";
$sall=""; $sall="";
} }
@ -86,10 +88,14 @@ $sql = "SELECT d.rowid, d.login, d.nom as lastname, d.prenom as firstname, d.soc
$sql.= " d.datefin,"; $sql.= " d.datefin,";
$sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,"; $sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
$sql.= " t.libelle as type, t.cotisation"; $sql.= " t.libelle as type, t.cotisation";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_member as cf"; if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_member as cm ON d.rowid = cm.fk_member"; // We need this table joined to the select in order to filter by categ
$sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
$sql.= " WHERE d.fk_adherent_type = t.rowid "; $sql.= " WHERE d.fk_adherent_type = t.rowid ";
if ($search_categ) $sql.= " AND d.rowid = cf.fk_member"; // Join for the needed table to filter by categ if ($catid > 0) $sql.= " AND cm.fk_categorie = ".$catid;
if ($catid == -2) $sql.= " AND cm.fk_categorie IS NULL";
if ($search_categ > 0) $sql.= " AND cm.fk_categorie = ".$search_categ;
if ($search_categ == -2) $sql.= " AND cm.fk_categorie IS NULL";
$sql.= " AND d.entity = ".$conf->entity; $sql.= " AND d.entity = ".$conf->entity;
if ($sall) if ($sall)
{ {
@ -132,11 +138,6 @@ if ($filter == 'outofdate')
{ {
$sql.=" AND datefin < '".$db->idate($now)."'"; $sql.=" AND datefin < '".$db->idate($now)."'";
} }
// Insert categ filter
if ($search_categ)
{
$sql.= " AND cf.fk_categorie = ".$db->escape($search_categ);
}
// Count total nb of records with no order and no limits // Count total nb of records with no order and no limits
$nbtotalofrecords = 0; $nbtotalofrecords = 0;
@ -200,7 +201,7 @@ if ($resql)
if ($conf->categorie->enabled) if ($conf->categorie->enabled)
{ {
$moreforfilter.=$langs->trans('Categories'). ': '; $moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$formother->select_categories(3,$search_categ,'search_categ'); $moreforfilter.=$formother->select_categories(3,$search_categ,'search_categ',1);
$moreforfilter.=' &nbsp; &nbsp; &nbsp; '; $moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
} }
if ($moreforfilter) if ($moreforfilter)

18
htdocs/admin/ihm.php
View File

@ -102,6 +102,9 @@ print "<br>\n";
if ($action == 'edit') // Edit if ($action == 'edit') // Edit
{ {
//WYSIWYG Editor
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
@ -133,12 +136,10 @@ if ($action == 'edit') // Edit
print '</table><br>'."\n"; print '</table><br>'."\n";
// Themes // Themes
show_theme('',1); show_theme('',1);
print '<br>'; print '<br>';
// Liste des zone de recherche permanantes supportees // Liste des zone de recherche permanantes supportees
print '<table summary="search" class="noborder" width="100%">'; print '<table summary="search" class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="35%">'.$langs->trans("PermanentLeftSearchForm").'</td><td colspan="2">'.$langs->trans("Activated").'</td></tr>'; print '<tr class="liste_titre"><td width="35%">'.$langs->trans("PermanentLeftSearchForm").'</td><td colspan="2">'.$langs->trans("Activated").'</td></tr>';
@ -228,7 +229,7 @@ if ($action == 'edit') // Edit
// Hide wiki link on login page // Hide wiki link on login page
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td>'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td>';
print $form->selectyesno('MAIN_HELP_DISABLELINK',isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0,1); print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0,1);
print '</td>'; print '</td>';
print '<td width="20">&nbsp;</td>'; print '<td width="20">&nbsp;</td>';
print '</tr>'; print '</tr>';
@ -236,18 +237,19 @@ if ($action == 'edit') // Edit
// Message on login page // Message on login page
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
// Editeur wysiwyg
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME)?$conf->global->MAIN_HOME:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, 90);
$doleditor=new DolEditor('main_home',(isset($conf->global->MAIN_HOME)?$conf->global->MAIN_HOME:''),'',142,'dolibarr_notes','In',false,true,true,ROWS_4,90);
$doleditor->Create(); $doleditor->Create();
print '</td></tr>'."\n"; print '</td></tr>'."\n";
// Message of the day on home page // Message of the day on home page
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('main_motd',(isset($conf->global->MAIN_MOTD)?$conf->global->MAIN_MOTD:''),'',142,'dolibarr_notes','In',false,true,true,ROWS_4,90); $doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD)?$conf->global->MAIN_MOTD:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, 90);
$doleditor->Create(); $doleditor->Create();
print '</td></tr>'."\n"; print '</td></tr>'."\n";
/* /*

2
htdocs/admin/system/index.php
View File

@ -75,7 +75,7 @@ print "<br>\n";
// Php // Php
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Php")."</td></tr>\n"; print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("PHP")."</td></tr>\n";
$phpversion=version_php(); $phpversion=version_php();
print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>".$phpversion."</td></tr>\n"; print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>".$phpversion."</td></tr>\n";
print "<tr $bc[1]><td>".$langs->trans("PhpWebLink")."</td><td>".php_sapi_name()."</td></tr>\n"; print "<tr $bc[1]><td>".$langs->trans("PhpWebLink")."</td><td>".php_sapi_name()."</td></tr>\n";

9
htdocs/categories/categorie.php
View File

@ -223,7 +223,7 @@ if ($socid)
print '</td></tr>'; print '</td></tr>';
} }
if ($conf->global->MAIN_MODULE_BARCODE) if (! empty($conf->global->MAIN_MODULE_BARCODE))
{ {
print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$soc->barcode.'</td></tr>'; print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$soc->barcode.'</td></tr>';
} }
@ -268,7 +268,7 @@ if ($socid)
print '</table>'; print '</table>';
print '</div>'; dol_fiche_end();
dol_htmloutput_mesg($mesg); dol_htmloutput_mesg($mesg);
@ -328,7 +328,7 @@ else if ($id || $ref)
print '</table>'; print '</table>';
print '</div>'; dol_fiche_end();
dol_htmloutput_mesg($mesg); dol_htmloutput_mesg($mesg);
@ -409,7 +409,7 @@ else if ($id || $ref)
print '</table>'; print '</table>';
print '</div>'; dol_fiche_end();
dol_htmloutput_mesg($mesg); dol_htmloutput_mesg($mesg);
@ -482,6 +482,7 @@ function formCategory($db,$object,$typeid,$socid=0)
foreach ($cats as $cat) foreach ($cats as $cat)
{ {
$ways = $cat->print_all_ways(); $ways = $cat->print_all_ways();
foreach ($ways as $way) foreach ($ways as $way)
{ {
$var = ! $var; $var = ! $var;

17
htdocs/categories/class/categorie.class.php
View File

@ -1092,21 +1092,18 @@ class Categorie
foreach ($parents as $parent) foreach ($parents as $parent)
{ {
$allways=$parent->get_all_ways(); $allways=$parent->get_all_ways();
if (! empty($allways)) foreach ($allways as $way)
{ {
foreach ($allways as $way) $w = $way;
{ $w[] = $this;
$w = $way; $ways[] = $w;
$w[] = $this;
$ways[] = $w;
}
} }
} }
if (count($ways) == 0)
$ways[0][0] = $this;
} }
if (count($ways) == 0)
$ways[0][0] = $this;
return $ways; return $ways;
} }

20
htdocs/categories/edit.php
View File

@ -34,6 +34,12 @@ $type=GETPOST('type');
$action=GETPOST('action'); $action=GETPOST('action');
$confirm=GETPOST('confirm'); $confirm=GETPOST('confirm');
$socid=GETPOST('socid','int');
$nom=GETPOST('nom');
$description=GETPOST('description');
$visible=GETPOST('visible');
$catMere=GETPOST('catMere');
if ($id == "") if ($id == "")
{ {
dol_print_error('','Missing parameter id'); dol_print_error('','Missing parameter id');
@ -55,13 +61,13 @@ if ($action == 'update' && $user->rights->categorie->creer)
$categorie = new Categorie($db); $categorie = new Categorie($db);
$result=$categorie->fetch($id); $result=$categorie->fetch($id);
$categorie->label = $_POST["nom"]; $categorie->label = $nom;
$categorie->description = $_POST["description"]; $categorie->description = $description;
$categorie->socid = ($_POST["socid"] ? $_POST["socid"] : 'null'); $categorie->socid = ($socid ? $socid : 'null');
$categorie->visible = $_POST["visible"]; $categorie->visible = $visible;
if($_POST['catMere'] != "-1") if ($catMere != "-1")
$categorie->id_mere = $_POST['catMere']; $categorie->id_mere = $catMere;
else else
$categorie->id_mere = ""; $categorie->id_mere = "";
@ -76,7 +82,7 @@ if ($action == 'update' && $user->rights->categorie->creer)
$_GET["action"] = 'create'; $_GET["action"] = 'create';
$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Description")); $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Description"));
} }
if (! $categorie->error) if (empty($categorie->error))
{ {
if ($categorie->update($user) > 0) if ($categorie->update($user) > 0)
{ {

31
htdocs/categories/fiche.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2005 Matthieu Valleton <mv@seeschloss.org> /* Copyright (C) 2005 Matthieu Valleton <mv@seeschloss.org>
* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com> * Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -41,6 +41,12 @@ $catorigin = GETPOST('catorigin','int');
$type = GETPOST('type','alpha'); $type = GETPOST('type','alpha');
$urlfrom = GETPOST('urlfrom','alpha'); $urlfrom = GETPOST('urlfrom','alpha');
$socid=GETPOST('socid','int');
$nom=GETPOST('nom');
$description=GETPOST('description');
$visible=GETPOST('visible');
$catMere=GETPOST('catMere');
if ($origin) if ($origin)
{ {
if ($type == 0) $idProdOrigin = $origin; if ($type == 0) $idProdOrigin = $origin;
@ -101,22 +107,23 @@ if ($action == 'add' && $user->rights->categorie->creer)
$object = new Categorie($db); $object = new Categorie($db);
$object->label = $_POST["nom"]; $object->label = $nom;
$object->description = $_POST["description"]; $object->description = $description;
$object->socid = ($_POST["socid"] ? $_POST["socid"] : 'null'); $object->socid = ($socid ? $socid : 'null');
$object->visible = $_POST["visible"]; $object->visible = $visible;
$object->type = $type; $object->type = $type;
if($_POST['catMere'] != "-1") $object->id_mere = $_POST['catMere']; if ($catMere != "-1") $object->id_mere = $catMere;
if (! $object->label) if (! $object->label)
{ {
$object->error = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")); $error++;
$_GET["action"] = 'create'; $errors[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref"));
$action = 'create';
} }
// Create category in database // Create category in database
if (! $object->error) if (! $error)
{ {
$result = $object->create(); $result = $object->create();
if ($result > 0) if ($result > 0)
@ -197,19 +204,19 @@ if ($user->rights->categorie->creer)
print_fiche_titre($langs->trans("CreateCat")); print_fiche_titre($langs->trans("CreateCat"));
dol_htmloutput_errors($object->error); dol_htmloutput_errors('',$errors);
print '<table width="100%" class="border">'; print '<table width="100%" class="border">';
// Ref // Ref
print '<tr>'; print '<tr>';
print '<td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td><input name="nom" size="25" value="'.$object->label.'">'; print '<td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td><input name="nom" size="25" value="'.$nom.'">';
print'</td></tr>'; print'</td></tr>';
// Description // Description
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>'; print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('description',$object->description,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,ROWS_6,50); $doleditor=new DolEditor('description',$description,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,ROWS_6,50);
$doleditor->Create(); $doleditor->Create();
print '</td></tr>'; print '</td></tr>';

24
htdocs/categories/index.php
View File

@ -35,6 +35,8 @@ if (! $user->rights->categorie->lire) accessforbidden();
$id=GETPOST('id','int'); $id=GETPOST('id','int');
$type=(GETPOST('type') ? GETPOST('type') : 0); $type=(GETPOST('type') ? GETPOST('type') : 0);
$catname=GETPOST('catname','alpha');
$section=(GETPOST('section')?GETPOST('section'):0);
/* /*
@ -70,7 +72,7 @@ print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("Search").'</td>'; print '<td colspan="3">'.$langs->trans("Search").'</td>';
print '</tr>'; print '</tr>';
print '<tr '.$bc[0].'><td>'; print '<tr '.$bc[0].'><td>';
print $langs->trans("Name").':</td><td><input class="flat" type="text" size="20" name="catname" value="' . $_POST['catname'] . '"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>'; print $langs->trans("Name").':</td><td><input class="flat" type="text" size="20" name="catname" value="' . $catname . '"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
/* /*
// faire une rech dans une sous categorie uniquement // faire une rech dans une sous categorie uniquement
print '<tr '.$bc[0].'><td>'; print '<tr '.$bc[0].'><td>';
@ -89,9 +91,9 @@ print '</td><td valign="top" width="70%">';
/* /*
* Categories found * Categories found
*/ */
if($_POST['catname'] || $id > 0) if ($catname || $id > 0)
{ {
$cats = $categstatic->rechercher($id,$_POST['catname'],$type); $cats = $categstatic->rechercher($id,$catname,$type);
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("FoundCats").'</td></tr>'; print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("FoundCats").'</td></tr>';
@ -126,17 +128,10 @@ $cate_arbo = $categstatic->get_full_arbo($type);
// Define fulltree array // Define fulltree array
$fulltree=$cate_arbo; $fulltree=$cate_arbo;
print '<table class="liste" width="100%">'; print '<table class="liste" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Categories").'</td><td colspan="3">'.$langs->trans("Description").'</td></tr>'; print '<tr class="liste_titre"><td>'.$langs->trans("Categories").'</td><td colspan="3">'.$langs->trans("Description").'</td></tr>';
$section=isset($_GET["section"])?$_GET["section"]:$_POST['section'];
if (! $section) $section=0;
// ----- This section will show a tree from a fulltree array ----- // ----- This section will show a tree from a fulltree array -----
// $section must also be defined // $section must also be defined
// --------------------------------------------------------------- // ---------------------------------------------------------------
@ -212,9 +207,10 @@ foreach($fulltree as $key => $val)
$showline=0; $showline=0;
// If directory is son of expanded directory, we show line // If directory is son of expanded directory, we show line
if (in_array($val['id_mere'],$expandedsectionarray)) $showline=4; if (isset($val['id_mere']) && in_array($val['id_mere'],$expandedsectionarray)) $showline=4;
// If directory is brother of selected directory, we show line // If directory is brother of selected directory, we show line
elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) $showline=3; // FIXME $ecmdirstatic not exist or not instantiate ?
//elseif (isset($val['id_mere']) && $val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) $showline=3;
// If directory is parent of selected directory or is selected directory, we show line // If directory is parent of selected directory or is selected directory, we show line
elseif (preg_match('/'.$val['fullpath'].'_/i',$fullpathselected.'_')) $showline=2; elseif (preg_match('/'.$val['fullpath'].'_/i',$fullpathselected.'_')) $showline=2;
// If we are level one we show line // If we are level one we show line
@ -243,7 +239,9 @@ foreach($fulltree as $key => $val)
print '<td valign="top">'; print '<td valign="top">';
//print $val['fullpath']."(".$showline.")"; //print $val['fullpath']."(".$showline.")";
$n='2'; $n='2';
if ($b == 0 || ! in_array($val['id'],$expandedsectionarray)) $n='3'; // FIXME $b not define ?
//if ($b == 0 || ! in_array($val['id'],$expandedsectionarray)) $n='3';
if (! in_array($val['id'],$expandedsectionarray)) $n='3';
if (! in_array($val['id'],$expandedsectionarray)) $ref=img_picto('',DOL_URL_ROOT.'/theme/common/treemenu/plustop'.$n.'.gif','',1); if (! in_array($val['id'],$expandedsectionarray)) $ref=img_picto('',DOL_URL_ROOT.'/theme/common/treemenu/plustop'.$n.'.gif','',1);
else $ref=img_picto('',DOL_URL_ROOT.'/theme/common/treemenu/minustop'.$n.'.gif','',1); else $ref=img_picto('',DOL_URL_ROOT.'/theme/common/treemenu/minustop'.$n.'.gif','',1);
if ($option == 'indexexpanded') $lien = '<a href="'.$_SERVER["PHP_SELF"].'?section='.$val['id'].'&amp;type='.$type.'&amp;sectionexpand=false">'; if ($option == 'indexexpanded') $lien = '<a href="'.$_SERVER["PHP_SELF"].'?section='.$val['id'].'&amp;type='.$type.'&amp;sectionexpand=false">';

2
htdocs/categories/photos.php
View File

@ -63,7 +63,7 @@ if ($id > 0)
* Actions * Actions
*/ */
if ($_FILES['userfile']['size'] > 0 && $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
if ($object->id) $result = $object->add_photo($upload_dir, $_FILES['userfile']); if ($object->id) $result = $object->add_photo($upload_dir, $_FILES['userfile']);
} }

7
htdocs/categories/viewcat.php
View File

@ -173,7 +173,6 @@ else
$var=true; $var=true;
foreach ($cats as $cat) foreach ($cats as $cat)
{ {
$i++;
$var=!$var; $var=!$var;
print "\t<tr ".$bc[$var].">\n"; print "\t<tr ".$bc[$var].">\n";
print "\t\t<td nowrap=\"nowrap\">"; print "\t\t<td nowrap=\"nowrap\">";
@ -219,11 +218,9 @@ if ($object->type == 0)
if (count($prods) > 0) if (count($prods) > 0)
{ {
$i = 0;
$var=true; $var=true;
foreach ($prods as $prod) foreach ($prods as $prod)
{ {
$i++;
$var=!$var; $var=!$var;
print "\t<tr ".$bc[$var].">\n"; print "\t<tr ".$bc[$var].">\n";
print '<td nowrap="nowrap" valign="top">'; print '<td nowrap="nowrap" valign="top">';
@ -257,11 +254,9 @@ if ($object->type == 1)
if (count($socs) > 0) if (count($socs) > 0)
{ {
$i = 0;
$var=true; $var=true;
foreach ($socs as $soc) foreach ($socs as $soc)
{ {
$i++;
$var=!$var; $var=!$var;
print "\t<tr ".$bc[$var].">\n"; print "\t<tr ".$bc[$var].">\n";
@ -335,11 +330,9 @@ if ($object->type == 3)
if (count($prods) > 0) if (count($prods) > 0)
{ {
$i = 0;
$var=true; $var=true;
foreach ($prods as $key => $member) foreach ($prods as $key => $member)
{ {
$i++;
$var=!$var; $var=!$var;
print "\t<tr ".$bc[$var].">\n"; print "\t<tr ".$bc[$var].">\n";
print '<td nowrap="nowrap" valign="top">'; print '<td nowrap="nowrap" valign="top">';

43
htdocs/comm/list.php
View File

@ -36,9 +36,9 @@ $socid = GETPOST('socid','int');
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user,'societe',$socid,''); $result = restrictedArea($user,'societe',$socid,'');
$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; $sortfield = GETPOST('sortfield','alpha');
$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; $sortorder = GETPOST('sortorder','alpha');
$page=isset($_GET["page"])?$_GET["page"]:$_POST["page"]; $page=GETPOST('page','int');
if ($page == -1) { $page = 0 ; } if ($page == -1) { $page = 0 ; }
$offset = $conf->liste_limit * $page; $offset = $conf->liste_limit * $page;
$pageprev = $page - 1; $pageprev = $page - 1;
@ -52,8 +52,9 @@ $search_code=GETPOST("search_code");
$search_compta=GETPOST("search_compta"); $search_compta=GETPOST("search_compta");
// Load sale and categ filters // Load sale and categ filters
$search_sale = GETPOST("search_sale"); $search_sale = GETPOST("search_sale");
$search_categ = GETPOST("search_categ"); $search_categ = GETPOST("search_categ",'int');
$catid = GETPOST("catid",'int');
/* /*
* Actions * Actions
@ -63,6 +64,7 @@ $search_categ = GETPOST("search_categ");
if (GETPOST("button_removefilter_x")) if (GETPOST("button_removefilter_x"))
{ {
$search_categ=''; $search_categ='';
$catid='';
$search_sale=''; $search_sale='';
$socname=""; $socname="";
$search_nom=""; $search_nom="";
@ -89,41 +91,30 @@ $sql = "SELECT s.rowid, s.nom as name, s.client, s.ville, st.libelle as stcomm,
$sql.= " s.datec, s.datea, s.canvas"; $sql.= " s.datec, s.datea, s.canvas";
// We'll need these fields in order to filter by sale (including the case where the user can only see his prospects) // We'll need these fields in order to filter by sale (including the case where the user can only see his prospects)
if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user"; if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user";
// We'll need these fields in order to filter by categ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_societe"; if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_societe"; // We need this table joined to the select in order to filter by categ
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,"; $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
$sql.= " ".MAIN_DB_PREFIX."c_stcomm as st";
// We'll need this table joined to the select in order to filter by sale // We'll need this table joined to the select in order to filter by sale
if ($search_sale || !$user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if ($search_sale || !$user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
// We'll need this table joined to the select in order to filter by categ
if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as cs";
$sql.= " WHERE s.fk_stcomm = st.id"; $sql.= " WHERE s.fk_stcomm = st.id";
$sql.= " AND s.client IN (1, 3)"; $sql.= " AND s.client IN (1, 3)";
$sql.= ' AND s.entity IN ('.getEntity('societe', 1).')'; $sql.= ' AND s.entity IN ('.getEntity('societe', 1).')';
if (!$user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (!$user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid) $sql.= " AND s.rowid = ".$socid; if ($socid) $sql.= " AND s.rowid = ".$socid;
if ($search_sale) $sql.= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale if ($search_sale) $sql.= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
if ($search_categ) $sql.= " AND s.rowid = cs.fk_societe"; // Join for the needed table to filter by categ if ($catid > 0) $sql.= " AND cs.fk_categorie = ".$catid;
if ($catid == -2) $sql.= " AND cs.fk_categorie IS NULL";
if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$search_categ;
if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
if ($search_nom) $sql.= " AND s.nom LIKE '%".$db->escape(strtolower($search_nom))."%'"; if ($search_nom) $sql.= " AND s.nom LIKE '%".$db->escape(strtolower($search_nom))."%'";
if ($search_ville) $sql.= " AND s.ville LIKE '%".$db->escape(strtolower($search_ville))."%'"; if ($search_ville) $sql.= " AND s.ville LIKE '%".$db->escape(strtolower($search_ville))."%'";
if ($search_code) $sql.= " AND s.code_client LIKE '%".$db->escape(strtolower($search_code))."%'"; if ($search_code) $sql.= " AND s.code_client LIKE '%".$db->escape(strtolower($search_code))."%'";
if ($search_compta) $sql .= " AND s.code_compta LIKE '%".$db->escape($search_compta)."%'"; if ($search_compta) $sql.= " AND s.code_compta LIKE '%".$db->escape($search_compta)."%'";
// Insert sale filter // Insert sale filter
if ($search_sale) if ($search_sale)
{ {
$sql .= " AND sc.fk_user = ".$search_sale; $sql .= " AND sc.fk_user = ".$search_sale;
} }
// Insert categ filter
if ($search_categ)
{
$sql .= " AND cs.fk_categorie = ".$search_categ;
}
if ($socname)
{
$sql.= " AND s.nom LIKE '%".$db->escape(strtolower($socname))."%'";
$sortfield = "s.nom";
$sortorder = "ASC";
}
// Count total nb of records // Count total nb of records
$nbtotalofrecords = 0; $nbtotalofrecords = 0;
@ -157,7 +148,7 @@ if ($result)
if ($conf->categorie->enabled) if ($conf->categorie->enabled)
{ {
$moreforfilter.=$langs->trans('Categories'). ': '; $moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$formother->select_categories(2,$search_categ,'search_categ'); $moreforfilter.=$formother->select_categories(2,$search_categ,'search_categ',1);
$moreforfilter.=' &nbsp; &nbsp; &nbsp; '; $moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
} }
// If the user can view prospects other than his' // If the user can view prospects other than his'
@ -180,7 +171,7 @@ if ($result)
print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta","",$param,'align="left"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"datec","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"datec","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$params,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="right"',$sortfield,$sortorder);
print "</tr>\n"; print "</tr>\n";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';

39
htdocs/comm/prospect/list.php
View File

@ -36,12 +36,15 @@ $socid = GETPOST("socid",'int');
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'societe',$socid,''); $result = restrictedArea($user, 'societe',$socid,'');
$action = GETPOST('action','alpha');
$socname = GETPOST("socname",'alpha'); $socname = GETPOST("socname",'alpha');
$stcomm = GETPOST("stcomm",'int'); $stcomm = GETPOST("stcomm",'int');
$search_nom = GETPOST("search_nom"); $search_nom = GETPOST("search_nom");
$search_ville = GETPOST("search_ville"); $search_ville = GETPOST("search_ville");
$search_departement = GETPOST("search_departement"); $search_departement = GETPOST("search_departement");
$search_datec = GETPOST("search_datec"); $search_datec = GETPOST("search_datec");
$search_categ = GETPOST("search_categ",'int');
$catid = GETPOST("catid",'int');
$sortfield = GETPOST("sortfield",'alpha'); $sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha'); $sortorder = GETPOST("sortorder",'alpha');
@ -125,8 +128,6 @@ if ($resql)
{ {
$search_levels[] = '"'.preg_replace('[^A-Za-z0-9_-]', '', $obj->code).'"'; $search_levels[] = '"'.preg_replace('[^A-Za-z0-9_-]', '', $obj->code).'"';
} }
$i++;
} }
// Implode the $search_levels array so that it can be use in a "IN (...)" where clause. // Implode the $search_levels array so that it can be use in a "IN (...)" where clause.
@ -136,8 +137,8 @@ if ($resql)
else dol_print_error($db); else dol_print_error($db);
// Load sale and categ filters // Load sale and categ filters
$search_sale = isset($_GET["search_sale"])?$_GET["search_sale"]:$_POST["search_sale"]; $search_sale = GETPOST('search_sale');
$search_categ = isset($_GET["search_categ"])?$_GET["search_categ"]:$_POST["search_categ"]; $search_categ = GETPOST('search_categ');
// If the user must only see his prospect, force searching by him // If the user must only see his prospect, force searching by him
if (!$user->rights->societe->client->voir && !$socid) $search_sale = $user->id; if (!$user->rights->societe->client->voir && !$socid) $search_sale = $user->id;
@ -147,7 +148,7 @@ $sts = array(-1,0,1,2,3);
/* /*
* Actions * Actions
*/ */
if ($_GET["action"] == 'cstc') if ($action == 'cstc')
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm = ".$_GET["pstcomm"]; $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm = ".$_GET["pstcomm"];
$sql .= " WHERE rowid = ".$_GET["socid"]; $sql .= " WHERE rowid = ".$_GET["socid"];
@ -165,25 +166,22 @@ $sql = "SELECT s.rowid, s.nom, s.ville, s.datec, s.datea, s.status as status,";
$sql.= " st.libelle as stcomm, s.prefix_comm, s.fk_stcomm, s.fk_prospectlevel,"; $sql.= " st.libelle as stcomm, s.prefix_comm, s.fk_stcomm, s.fk_prospectlevel,";
$sql.= " d.nom as departement"; $sql.= " d.nom as departement";
// Updated by Matelli // Updated by Matelli
// We'll need these fields in order to filter by sale (including the case where the user can only see his prospects) if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user";
// We'll need these fields in order to filter by categ
if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_societe";
$sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st"; $sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st";
// We'll need this table joined to the select in order to filter by sale if ($search_sale || !$user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
if ($search_sale || !$user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
// We'll need this table joined to the select in order to filter by categ
if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as cs";
$sql.= ", ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."societe as s";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d on (d.rowid = s.fk_departement)"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d on (d.rowid = s.fk_departement)";
if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_societe"; // We need this table joined to the select in order to filter by categ
$sql.= " WHERE s.fk_stcomm = st.id"; $sql.= " WHERE s.fk_stcomm = st.id";
$sql.= " AND s.client IN (2, 3)"; $sql.= " AND s.client IN (2, 3)";
$sql.= ' AND s.entity IN ('.getEntity('societe', 1).')'; $sql.= ' AND s.entity IN ('.getEntity('societe', 1).')';
if ($user->societe_id) $sql.= " AND s.rowid = " .$user->societe_id; if ($user->societe_id) $sql.= " AND s.rowid = " .$user->societe_id;
if ($search_sale) $sql.= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale if ($search_sale) $sql.= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
if ($search_categ) $sql.= " AND s.rowid = cs.fk_societe"; // Join for the needed table to filter by categ
if (isset($stcomm) && $stcomm != '') $sql.= " AND s.fk_stcomm=".$stcomm; if (isset($stcomm) && $stcomm != '') $sql.= " AND s.fk_stcomm=".$stcomm;
if ($catid > 0) $sql.= " AND cs.fk_categorie = ".$catid;
if ($catid == -2) $sql.= " AND cs.fk_categorie IS NULL";
if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$search_categ;
if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
if ($search_nom) $sql .= " AND s.nom LIKE '%".$db->escape(strtolower($search_nom))."%'"; if ($search_nom) $sql .= " AND s.nom LIKE '%".$db->escape(strtolower($search_nom))."%'";
if ($search_ville) $sql .= " AND s.ville LIKE '%".$db->escape(strtolower($search_ville))."%'"; if ($search_ville) $sql .= " AND s.ville LIKE '%".$db->escape(strtolower($search_ville))."%'";
if ($search_departement) $sql .= " AND d.nom LIKE '%".$db->escape(strtolower($search_departement))."%'"; if ($search_departement) $sql .= " AND d.nom LIKE '%".$db->escape(strtolower($search_departement))."%'";
@ -198,11 +196,6 @@ if ($search_sale)
{ {
$sql .= " AND sc.fk_user = ".$db->escape($search_sale); $sql .= " AND sc.fk_user = ".$db->escape($search_sale);
} }
// Insert categ filter
if ($search_categ)
{
$sql .= " AND cs.fk_categorie = ".$db->escape($search_categ);
}
if ($socname) if ($socname)
{ {
$sql .= " AND s.nom LIKE '%".$db->escape($socname)."%'"; $sql .= " AND s.nom LIKE '%".$db->escape($socname)."%'";
@ -271,7 +264,7 @@ if ($resql)
if ($conf->categorie->enabled) if ($conf->categorie->enabled)
{ {
$moreforfilter.=$langs->trans('Categories'). ': '; $moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$formother->select_categories(2,$search_categ,'search_categ'); $moreforfilter.=$formother->select_categories(2,$search_categ,'search_categ',1);
$moreforfilter.=' &nbsp; &nbsp; &nbsp; '; $moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
} }
// If the user can view prospects other than his' // If the user can view prospects other than his'
@ -296,7 +289,7 @@ if ($resql)
print_liste_field_titre($langs->trans("ProspectLevelShort"),$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("ProspectLevelShort"),$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("StatusProsp"),$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("StatusProsp"),$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder);
print '<td class="liste_titre">&nbsp;</td>'; print '<td class="liste_titre">&nbsp;</td>';
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$params,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="right"',$sortfield,$sortorder);
print "</tr>\n"; print "</tr>\n";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -423,7 +416,7 @@ else
dol_print_error($db); dol_print_error($db);
} }
$db->close();
llxFooter(); llxFooter();
$db->close();
?> ?>

9
htdocs/commande/fiche.php
View File

@ -1280,6 +1280,9 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
*********************************************************************/ *********************************************************************/
if ($action == 'create' && $user->rights->commande->creer) if ($action == 'create' && $user->rights->commande->creer)
{ {
//WYSIWYG Editor
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
print_fiche_titre($langs->trans('CreateOrder')); print_fiche_titre($langs->trans('CreateOrder'));
dol_htmloutput_mesg($mesg,$mesgs,'error'); dol_htmloutput_mesg($mesg,$mesgs,'error');
@ -1477,8 +1480,8 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
print '<tr>'; print '<tr>';
print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>'; print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
print '<td valign="top" colspan="2">'; print '<td valign="top" colspan="2">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1); print $doleditor->Create(1);
//print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_public.'</textarea>'; //print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
print '</td></tr>'; print '</td></tr>';
@ -1489,7 +1492,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
print '<tr>'; print '<tr>';
print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>'; print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
print '<td valign="top" colspan="2">'; print '<td valign="top" colspan="2">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); $doleditor=new DolEditor('note', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1); print $doleditor->Create(1);
//print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'</textarea>'; //print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'</textarea>';

26
htdocs/compta/deplacement/fiche.php
View File

@ -255,6 +255,9 @@ $form = new Form($db);
*/ */
if ($action == 'create') if ($action == 'create')
{ {
//WYSIWYG Editor
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
print_fiche_titre($langs->trans("NewTrip")); print_fiche_titre($langs->trans("NewTrip"));
dol_htmloutput_errors($mesg); dol_htmloutput_errors($mesg);
@ -295,9 +298,10 @@ if ($action == 'create')
print '<tr>'; print '<tr>';
print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>'; print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
print '<td valign="top" colspan="2">'; print '<td valign="top" colspan="2">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note_public',GETPOST('note_public','alpha'),600,200,'dolibarr_notes','In',false,true,true,ROWS_8,100); $doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), 600, 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, 100);
print $doleditor->Create(1); print $doleditor->Create(1);
print '</td></tr>'; print '</td></tr>';
// Private note // Private note
@ -306,9 +310,10 @@ if ($action == 'create')
print '<tr>'; print '<tr>';
print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>'; print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
print '<td valign="top" colspan="2">'; print '<td valign="top" colspan="2">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note_private',GETPOST('note_private','alpha'),600,200,'dolibarr_notes','In',false,true,true,ROWS_8,100); $doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), 600, 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, 100);
print $doleditor->Create(1); print $doleditor->Create(1);
print '</td></tr>'; print '</td></tr>';
} }
@ -332,6 +337,9 @@ else if ($id)
if ($action == 'edit' && $user->rights->deplacement->creer) if ($action == 'edit' && $user->rights->deplacement->creer)
{ {
//WYSIWYG Editor
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$soc = new Societe($db); $soc = new Societe($db);
if ($object->socid) if ($object->socid)
{ {
@ -382,9 +390,10 @@ else if ($id)
// Public note // Public note
print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>'; print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
print '<td valign="top" colspan="3">'; print '<td valign="top" colspan="3">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note_public',$object->note_public,600,200,'dolibarr_notes','In',false,true,true,ROWS_8,'100'); $doleditor = new DolEditor('note_public', $object->note_public, 600, 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '100');
print $doleditor->Create(1); print $doleditor->Create(1);
print "</td></tr>"; print "</td></tr>";
// Private note // Private note
@ -392,9 +401,10 @@ else if ($id)
{ {
print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>'; print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
print '<td valign="top" colspan="3">'; print '<td valign="top" colspan="3">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note_private',$object->note_private,600,200,'dolibarr_notes','In',false,true,true,ROWS_8,'100'); $doleditor = new DolEditor('note_private', $object->note_private, 600, 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '100');
print $doleditor->Create(1); print $doleditor->Create(1);
print "</td></tr>"; print "</td></tr>";
} }

43
htdocs/core/class/html.formcompany.class.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2008-2012 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2008-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2008-2012 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -673,26 +674,32 @@ class FormCompany
global $conf,$langs; global $conf,$langs;
$formlength=0; $formlength=0;
if ($country_code == 'FR' && empty($conf->global->MAIN_DISABLEPROFIDRULES)) if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
{ if ($country_code == 'FR')
if ($idprof==1) $formlength=9; {
if ($idprof==2) $formlength=14; if (isset($idprof)) {
if ($idprof==3) $formlength=5; // 4 chiffres et 1 lettre depuis janvier if ($idprof==1) $formlength=9;
if ($idprof==4) $formlength=32; // No maximum as we need to include a town name in this id else if ($idprof==2) $formlength=14;
} else if ($idprof==3) $formlength=5; // 4 chiffres et 1 lettre depuis janvier
if ($country_code == 'ES' && empty($conf->global->MAIN_DISABLEPROFIDRULES)) else if ($idprof==4) $formlength=32; // No maximum as we need to include a town name in this id
{ }
if ($idprof==1) $formlength=9; //CIF/NIF/NIE 9 digits }
if ($idprof==2) $formlength=12; //NASS 12 digits without / else if ($country_code == 'ES')
if ($idprof==3) $formlength=5; //CNAE 5 digits {
if ($idprof==4) $formlength=32; //depend of college if ($idprof==1) $formlength=9; //CIF/NIF/NIE 9 digits
if ($idprof==2) $formlength=12; //NASS 12 digits without /
if ($idprof==3) $formlength=5; //CNAE 5 digits
if ($idprof==4) $formlength=32; //depend of college
}
} }
$selected=$preselected; $selected=$preselected;
if (! $selected && $idprof==1) $selected=$this->idprof1; if (! $selected && isset($idprof)) {
if (! $selected && $idprof==2) $selected=$this->idprof2; if ($idprof==1 && ! empty($this->idprof1)) $selected=$this->idprof1;
if (! $selected && $idprof==3) $selected=$this->idprof3; else if ($idprof==2 && ! empty($this->idprof2)) $selected=$this->idprof2;
if (! $selected && $idprof==4) $selected=$this->idprof4; else if ($idprof==3 && ! empty($this->idprof3)) $selected=$this->idprof3;
else if ($idprof==4 && ! empty($this->idprof4)) $selected=$this->idprof4;
}
$maxlength=$formlength; $maxlength=$formlength;
if (empty($formlength)) { $formlength=24; $maxlength=128; } if (empty($formlength)) { $formlength=24; $maxlength=128; }

8
htdocs/core/lib/functions2.lib.php
View File

@ -583,6 +583,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]); if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
// Define $sqlwhere // Define $sqlwhere
$sqlwhere='';
// If a restore to zero after a month is asked we check if there is already a value for this year. // If a restore to zero after a month is asked we check if there is already a value for this year.
if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) $maskraz=preg_replace('/^@/','',$reg[2]); if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) $maskraz=preg_replace('/^@/','',$reg[2]);
@ -617,7 +618,6 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
if (dol_strlen($reg[$posy]) == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset); if (dol_strlen($reg[$posy]) == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);
if (dol_strlen($reg[$posy]) == 2) $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset); if (dol_strlen($reg[$posy]) == 2) $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);
if (dol_strlen($reg[$posy]) == 1) $yearcomp=substr(date("y",$date),2,1)+$yearoffset; if (dol_strlen($reg[$posy]) == 1) $yearcomp=substr(date("y",$date),2,1)+$yearoffset;
$sqlwhere='';
if ($monthcomp > 1) // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) if ($monthcomp > 1) // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1)
{ {
if (dol_strlen($reg[$posy]) == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1); if (dol_strlen($reg[$posy]) == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1);
@ -720,7 +720,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
{ {
$counter++; $counter++;
if ($maskrefclient_maskcounter) if (! empty($maskrefclient_maskcounter))
{ {
//print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n<br>"; //print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n<br>";
@ -1091,9 +1091,9 @@ function dol_set_user_param($db, $conf, &$user, $tab)
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";
$sql.= " VALUES (".$user->id.",".$conf->entity.","; $sql.= " VALUES (".$user->id.",".$conf->entity.",";
$sql.= " '".$key."','".$db->escape($value)."');"; $sql.= " '".$key."','".$db->escape($value)."')";
dol_syslog("functions2.lib::dol_set_user_param sql=".$sql, LOG_DEBUG);
dol_syslog("functions2.lib::dol_set_user_param sql=".$sql, LOG_DEBUG);
$result=$db->query($sql); $result=$db->query($sql);
if (! $result) if (! $result)
{ {

2
htdocs/core/lib/mailmanspip.lib.php
View File

@ -40,7 +40,7 @@ function mailmanspip_admin_prepare_head($object)
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/spip.php'; $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/spip.php';
$head[$h][1] = $langs->trans("Spip"); $head[$h][1] = $langs->trans("SPIP");
$head[$h][2] = 'spip'; $head[$h][2] = 'spip';
$h++; $h++;

15
htdocs/core/lib/price.lib.php
View File

@ -43,14 +43,14 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $txlocalta
$result=array(); $result=array();
// We work to define prices using the price without tax
$tot_sans_remise = $pu * $qty;
$tot_avec_remise_ligne = $tot_sans_remise * (1 - ($remise_percent_ligne / 100));
$tot_avec_remise = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
//dol_syslog("price.lib::calcul_price_total $qty, $pu, $remise_percent_ligne, $txtva, $price_base_type $info_bits"); //dol_syslog("price.lib::calcul_price_total $qty, $pu, $remise_percent_ligne, $txtva, $price_base_type $info_bits");
if ($price_base_type == 'HT') if ($price_base_type == 'HT')
{ {
// We work to define prices using the price without tax
$tot_sans_remise = $pu * $qty;
$tot_avec_remise_ligne = $tot_sans_remise * (1 - ($remise_percent_ligne / 100));
$tot_avec_remise = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
$result[6] = price2num($tot_sans_remise, 'MT'); $result[6] = price2num($tot_sans_remise, 'MT');
$result[8] = price2num($tot_sans_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non $result[8] = price2num($tot_sans_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non
$result8bis= price2num($tot_sans_remise * (1 + ( $txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR) $result8bis= price2num($tot_sans_remise * (1 + ( $txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
@ -69,11 +69,6 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $txlocalta
} }
else else
{ {
// We work to define prices using the price with tax
$tot_sans_remise = $pu * $qty;
$tot_avec_remise_ligne = $tot_sans_remise * (1 - ($remise_percent_ligne / 100));
$tot_avec_remise = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
$result[8] = price2num($tot_sans_remise, 'MT'); $result[8] = price2num($tot_sans_remise, 'MT');
$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non $result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non
$result6bis= price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR) $result6bis= price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)

3
htdocs/core/lib/treeview.lib.php
View File

@ -101,7 +101,8 @@ function tree_showpad(&$fulltree,$key,$silent=0)
if ($fulltree[$key2]['level'] > $pos) if ($fulltree[$key2]['level'] > $pos)
{ {
$nbofdirinsub++; $nbofdirinsub++;
$nbofdocinsub+=$fulltree[$key2]['cachenbofdoc']; if (! empty($fulltree[$key2]['cachenbofdoc']))
$nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
} }
if ($fulltree[$key2]['level'] == $pos) if ($fulltree[$key2]['level'] == $pos)
{ {

42
htdocs/core/lib/usergroups.lib.php
View File

@ -174,12 +174,21 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
$thumbsbyrow=6; $thumbsbyrow=6;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
$var=false;
// Title // Title
if ($foruserprofile) if ($foruserprofile)
{ {
print '<tr class="liste_titre"><th width="25%">'.$langs->trans("Parameter").'</th><th width="25%">'.$langs->trans("DefaultValue").'</th>'; print '<tr class="liste_titre"><th width="25%">'.$langs->trans("Parameter").'</th><th width="25%">'.$langs->trans("DefaultValue").'</th>';
print '<th colspan="2">&nbsp;</th>'; print '<th colspan="2">&nbsp;</th>';
print '</tr>'; print '</tr>';
print '<tr '.$bc[$var].'>';
print '<td>'.$langs->trans("DefaultSkin").'</td>';
print '<td>'.$conf->global->MAIN_THEME.'</td>';
print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
print '<td>&nbsp;</td>';
print '</tr>';
} }
else else
{ {
@ -192,31 +201,16 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print $langs->trans('DownloadMoreSkins'); print $langs->trans('DownloadMoreSkins');
print '</a>'; print '</a>';
print '</th></tr>'; print '</th></tr>';
}
$var=false; print '<tr '.$bc[$var].'>';
print '<td>'.$langs->trans("ThemeDir").'</td>';
if ($foruserprofile) print '<td>';
{ foreach($dirthemes as $dirtheme)
print '<tr '.$bc[$var].'>'; {
print '<td>'.$langs->trans("DefaultSkin").'</td>'; echo '"'.$dirtheme.'" ';
print '<td>'.$conf->global->MAIN_THEME.'</td>'; }
print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>'; print '</td>';
print '<td>&nbsp;</td>'; print '</tr>';
print '</tr>';
}
if (! $foruserprofile)
{
print '<tr '.$bc[$var].'>';
print '<td>'.$langs->trans("ThemeDir").'</td>';
print '<td>';
foreach($dirthemes as $dirtheme)
{
echo '"'.$dirtheme.'" ';
}
print '</td>';
print '</tr>';
} }
$var=!$var; $var=!$var;

10
htdocs/core/menus/standard/eldy.lib.php
View File

@ -680,7 +680,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
$newmenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1); $newmenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1);
$newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"),1); $newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"),1);
$newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1); $newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1);
$newmenu->add("/admin/sms.php?mainmenu=home", $langs->trans("Sms"),1); $newmenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"),1);
$newmenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionnarySetup"),1); $newmenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionnarySetup"),1);
$newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1); $newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
} }
@ -782,7 +782,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
if ($conf->societe->enabled && $conf->fournisseur->enabled) if ($conf->societe->enabled && $conf->fournisseur->enabled)
{ {
$langs->load("suppliers"); $langs->load("suppliers");
$newmenu->add("/fourn/liste.php?leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, $user->rights->societe->lire && $user->rights->fournisseur->lire, '', $mainmenu, 'suppliers'); $newmenu->add("/fourn/liste.php?leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, $user->rights->fournisseur->lire, '', $mainmenu, 'suppliers');
if ($user->societe_id == 0) if ($user->societe_id == 0)
{ {
@ -1218,7 +1218,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
$langs->load("bills"); $langs->load("bills");
$newmenu->add("/fourn/facture/index.php?leftmenu=orders", $langs->trans("Bills"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'orders'); $newmenu->add("/fourn/facture/index.php?leftmenu=orders", $langs->trans("Bills"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'orders');
if (isset($user->societe_id) && $user->societe_id == 0) if (empty($user->societe_id))
{ {
$newmenu->add("/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer); $newmenu->add("/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer);
} }
@ -1238,7 +1238,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
{ {
$langs->load("categories"); $langs->load("categories");
$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=1", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat'); $newmenu->add("/categories/index.php?leftmenu=cat&amp;type=1", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat');
if (isset($user->societe_id) && $user->societe_id == 0) if (empty($user->societe_id))
{ {
$newmenu->add("/categories/fiche.php?action=create&amp;type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); $newmenu->add("/categories/fiche.php?action=create&amp;type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
} }
@ -1342,7 +1342,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
{ {
$langs->load("categories"); $langs->load("categories");
$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat'); $newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat');
if (isset($user->societe_id) && $user->societe_id == 0) if (empty($user->societe_id))
{ {
$newmenu->add("/categories/fiche.php?action=create&amp;type=3", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); $newmenu->add("/categories/fiche.php?action=create&amp;type=3", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
} }

34
htdocs/core/modules/modSociete.class.php
View File

@ -127,6 +127,23 @@ class modSociete extends DolibarrModules
$this->rights[$r][3] = 1; // La permission est-elle une permission par defaut $this->rights[$r][3] = 1; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'lire'; $this->rights[$r][4] = 'lire';
/* $r++;
$this->rights[$r][0] = 241;
$this->rights[$r][1] = 'Read thirdparties customers';
$this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'thirparty_customer_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
$this->rights[$r][5] = 'read';
$r++;
$this->rights[$r][0] = 242;
$this->rights[$r][1] = 'Read thirdparties suppliers';
$this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'thirdparty_supplier_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
$this->rights[$r][5] = 'read';
*/
$r++; $r++;
$this->rights[$r][0] = 122; // id de la permission $this->rights[$r][0] = 122; // id de la permission
$this->rights[$r][1] = 'Creer modifier les societes'; // libelle de la permission $this->rights[$r][1] = 'Creer modifier les societes'; // libelle de la permission
@ -134,6 +151,23 @@ class modSociete extends DolibarrModules
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'creer'; $this->rights[$r][4] = 'creer';
/* $r++;
$this->rights[$r][0] = 251;
$this->rights[$r][1] = 'Create thirdparties customers';
$this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'thirparty_customer_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
$this->rights[$r][5] = 'read';
$r++;
$this->rights[$r][0] = 252;
$this->rights[$r][1] = 'Create thirdparties suppliers';
$this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'thirdparty_supplier_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
$this->rights[$r][5] = 'read';
*/
$r++; $r++;
$this->rights[$r][0] = 125; // id de la permission $this->rights[$r][0] = 125; // id de la permission
$this->rights[$r][1] = 'Supprimer les societes'; // libelle de la permission $this->rights[$r][1] = 'Supprimer les societes'; // libelle de la permission

14
htdocs/core/modules/societe/modules_societe.class.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -193,25 +193,25 @@ abstract class ModeleThirdPartyCode
if ($type == 0) if ($type == 0)
{ {
$s.=$langs->trans("RequiredIfCustomer").': '; $s.=$langs->trans("RequiredIfCustomer").': ';
if ($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED && !empty($this->code_null)) $s.='<strike>'; if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
$s.=yn(!$this->code_null,1,2); $s.=yn(!$this->code_null,1,2);
if ($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED && !empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')'; if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
$s.='<br>'; $s.='<br>';
} }
if ($type == 1) if ($type == 1)
{ {
$s.=$langs->trans("RequiredIfSupplier").': '; $s.=$langs->trans("RequiredIfSupplier").': ';
if ($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED && !empty($this->code_null)) $s.='<strike>'; if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
$s.=yn(!$this->code_null,1,2); $s.=yn(!$this->code_null,1,2);
if ($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED && !empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')'; if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
$s.='<br>'; $s.='<br>';
} }
if ($type == -1) if ($type == -1)
{ {
$s.=$langs->trans("Required").': '; $s.=$langs->trans("Required").': ';
if ($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED && !empty($this->code_null)) $s.='<strike>'; if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
$s.=yn(!$this->code_null,1,2); $s.=yn(!$this->code_null,1,2);
if ($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED && !empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')'; if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
$s.='<br>'; $s.='<br>';
} }
$s.=$langs->trans("CanBeModifiedIfOk").': '; $s.=$langs->trans("CanBeModifiedIfOk").': ';

2
htdocs/fichinter/fiche.php
View File

@ -1124,7 +1124,7 @@ else if ($id > 0 || ! empty($ref))
$now=dol_now(); $now=dol_now();
$timearray=dol_getdate($now); $timearray=dol_getdate($now);
if (!GETPOST('diday','int')) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']); if (!GETPOST('diday','int')) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
else $timewithnohour=dol_mktime(GETPOST('dihour','int'),GETPOST('dimin','int'),GETPOST('disec','int'),GETPOST('dimonth','int'),GETPOST('diday','int'),GETPOST('diyear','int')); else $timewithnohour=dol_mktime(GETPOST('dihour','int'),GETPOST('dimin','int'), 0,GETPOST('dimonth','int'),GETPOST('diday','int'),GETPOST('diyear','int'));
$form->select_date($timewithnohour,'di',1,1,0,"addinter"); $form->select_date($timewithnohour,'di',1,1,0,"addinter");
print '</td>'; print '</td>';

11
htdocs/fourn/commande/fiche.php
View File

@ -1408,6 +1408,9 @@ if ($id > 0 || ! empty($ref))
*/ */
if ($object->statut == 0 && $user->rights->fournisseur->commande->creer && $action <> 'editline') if ($object->statut == 0 && $user->rights->fournisseur->commande->creer && $action <> 'editline')
{ {
//WYSIWYG Editor
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'; print '<td>';
print '<a name="add"></a>'; // ancre print '<a name="add"></a>'; // ancre
@ -1434,11 +1437,9 @@ if ($id > 0 || ! empty($ref))
if ($forceall || ($conf->product->enabled && $conf->service->enabled) if ($forceall || ($conf->product->enabled && $conf->service->enabled)
|| (empty($conf->product->enabled) && empty($conf->service->enabled))) print '<br>'; || (empty($conf->product->enabled) && empty($conf->service->enabled))) print '<br>';
// Editor wysiwyg
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$nbrows=ROWS_2; $nbrows=ROWS_2;
if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
$doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); $doleditor = new DolEditor('dp_desc', GETPOST('dp_desc'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, $nbrows, 70);
$doleditor->Create(); $doleditor->Create();
print '</td>'; print '</td>';
@ -1492,11 +1493,9 @@ if ($id > 0 || ! empty($ref))
echo $hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action); echo $hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action);
} }
// Editor wysiwyg
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$nbrows=ROWS_2; $nbrows=ROWS_2;
if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
$doleditor=new DolEditor('np_desc',GETPOST('np_desc'),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); $doleditor = new DolEditor('np_desc', GETPOST('np_desc'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, $nbrows, 70);
$doleditor->Create(); $doleditor->Create();
print '</td>'; print '</td>';

32
htdocs/fourn/liste.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -37,6 +37,8 @@ $search_ville = GETPOST("search_ville");
$search_code_fournisseur = GETPOST("search_code_fournisseur"); $search_code_fournisseur = GETPOST("search_code_fournisseur");
$search_compta_fournisseur = GETPOST("search_compta_fournisseur"); $search_compta_fournisseur = GETPOST("search_compta_fournisseur");
$search_datec = GETPOST("search_datec"); $search_datec = GETPOST("search_datec");
$search_categ = GETPOST('search_categ','int');
$catid = GETPOST("catid",'int');
// Security check // Security check
$socid = GETPOST('socid','int'); $socid = GETPOST('socid','int');
@ -53,8 +55,6 @@ $pagenext = $page + 1;
if (! $sortorder) $sortorder="ASC"; if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="nom"; if (! $sortfield) $sortfield="nom";
// Load categ filters
$search_categ = GETPOST('search_categ');
/* /*
@ -70,12 +70,12 @@ llxHeader('',$langs->trans("ThirdParty"),$help_url);
$sql = "SELECT s.rowid as socid, s.nom, s.ville, s.datec, s.datea, st.libelle as stcomm, s.prefix_comm, s.status as status, "; $sql = "SELECT s.rowid as socid, s.nom, s.ville, s.datec, s.datea, st.libelle as stcomm, s.prefix_comm, s.status as status, ";
$sql.= "code_fournisseur, code_compta_fournisseur"; $sql.= "code_fournisseur, code_compta_fournisseur";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_fournisseur as cf"; if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cf ON s.rowid = cf.fk_societe"; // We need this table joined to the select in order to filter by categ
$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.fk_stcomm = st.id AND s.fournisseur = 1"; $sql.= " WHERE s.fk_stcomm = st.id AND s.fournisseur = 1";
$sql.= " AND s.entity IN (".getEntity('societe', 1).")"; $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
if ($search_categ) $sql.= " AND s.rowid = cf.fk_societe"; // Join for the needed table to filter by categ
if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid) $sql .= " AND s.rowid = ".$socid; if ($socid) $sql .= " AND s.rowid = ".$socid;
if ($socname) if ($socname)
@ -89,12 +89,10 @@ if ($search_ville) $sql .= " AND s.ville LIKE '%".$db->escape($search_ville)."%'
if ($search_code_fournisseur) $sql .= " AND s.code_fournisseur LIKE '%".$db->escape($search_code_fournisseur)."%'"; if ($search_code_fournisseur) $sql .= " AND s.code_fournisseur LIKE '%".$db->escape($search_code_fournisseur)."%'";
if ($search_compta_fournisseur) $sql .= " AND s.code_compta_fournisseur LIKE '%".$db->escape($search_compta_fournisseur)."%'"; if ($search_compta_fournisseur) $sql .= " AND s.code_compta_fournisseur LIKE '%".$db->escape($search_compta_fournisseur)."%'";
if ($search_datec) $sql .= " AND s.datec LIKE '%".$db->escape($search_datec)."%'"; if ($search_datec) $sql .= " AND s.datec LIKE '%".$db->escape($search_datec)."%'";
if ($catid > 0) $sql.= " AND cf.fk_categorie = ".$catid;
// Insert categ filter if ($catid == -2) $sql.= " AND cf.fk_categorie IS NULL";
if ($search_categ) if ($search_categ > 0) $sql.= " AND cf.fk_categorie = ".$search_categ;
{ if ($search_categ == -2) $sql.= " AND cf.fk_categorie IS NULL";
$sql .= " AND cf.fk_categorie = ".$db->escape($search_categ);
}
// Count total nb of records // Count total nb of records
$nbtotalofrecords = 0; $nbtotalofrecords = 0;
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@ -111,10 +109,10 @@ if ($resql)
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
$param = "&amp;search_nom=".$search_nom."&amp;search_code=".$search_code."&amp;search_ville=".$search_ville; $param = "&amp;search_nom=".$search_nom."&amp;search_code_fournisseur=".$search_code_fournisseur."&amp;search_ville=".$search_ville;
if ($search_categ != '') $param.='&amp;search_categ='.$search_categ; if ($search_categ != '') $param.='&amp;search_categ='.$search_categ;
print_barre_liste($langs->trans("ListOfSuppliers"), $page, "liste.php", $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords); print_barre_liste($langs->trans("ListOfSuppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
print '<form action="liste.php" method="GET">'; print '<form action="liste.php" method="GET">';
print '<table class="liste" width="100%">'; print '<table class="liste" width="100%">';
@ -124,7 +122,7 @@ if ($resql)
if ($conf->categorie->enabled) if ($conf->categorie->enabled)
{ {
$moreforfilter.=$langs->trans('Categories'). ': '; $moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$htmlother->select_categories(1,$search_categ,'search_categ'); $moreforfilter.=$htmlother->select_categories(1,$search_categ,'search_categ',1);
$moreforfilter.=' &nbsp; &nbsp; &nbsp; '; $moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
} }
if ($moreforfilter) if ($moreforfilter)
@ -141,7 +139,7 @@ if ($resql)
print_liste_field_titre($langs->trans("SupplierCode"),$_SERVER["PHP_SELF"],"s.code_fournisseur","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("SupplierCode"),$_SERVER["PHP_SELF"],"s.code_fournisseur","",$param,'align="left"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta_fournisseur","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta_fournisseur","",$param,'align="left"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"s.datec","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"s.datec","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$params,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="right"',$sortfield,$sortorder);
print "</tr>\n"; print "</tr>\n";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';

6
htdocs/install/mysql/data/llx_10_c_regions.sql
View File

@ -118,6 +118,12 @@ INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act
-- Regions Switzerland (id country=6) -- Regions Switzerland (id country=6)
INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (601, 6, 601, '', 1, 'Cantons', 1); INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (601, 6, 601, '', 1, 'Cantons', 1);
-- Regions England (id_country=7)
INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (701, 7, 701, '', 0, 'England', 1);
INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (702, 7, 702, '', 0, 'Wales', 1);
INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (703, 7, 703, '', 0, 'Scotland', 1);
INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (704, 7, 704, '', 0, 'Northern Ireland', 1);
-- Regions Tunisia (id country=10) -- Regions Tunisia (id country=10)
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1001,10,1001, '',0,'Ariana'); insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1001,10,1001, '',0,'Ariana');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1002,10,1002, '',0,'Béja'); insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1002,10,1002, '',0,'Béja');

122
htdocs/install/mysql/data/llx_20_c_departements.sql
View File

@ -384,6 +384,128 @@ INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) V
INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'ZG','ZUG','Zug',1); INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'ZG','ZUG','Zug',1);
INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'ZH','ZURICH','Zürich',1); INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'ZH','ZURICH','Zürich',1);
-- Provinces GB (id country=7)
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('701', 701, NULL, 0,NULL, 'Bedfordshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('702', 701, NULL, 0,NULL, 'Berkshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('703', 701, NULL, 0,NULL, 'Bristol, City of', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('704', 701, NULL, 0,NULL, 'Buckinghamshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('705', 701, NULL, 0,NULL, 'Cambridgeshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('706', 701, NULL, 0,NULL, 'Cheshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('707', 701, NULL, 0,NULL, 'Cleveland', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('708', 701, NULL, 0,NULL, 'Cornwall', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('709', 701, NULL, 0,NULL, 'Cumberland', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('710', 701, NULL, 0,NULL, 'Cumbria', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('711', 701, NULL, 0,NULL, 'Derbyshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('712', 701, NULL, 0,NULL, 'Devon', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('713', 701, NULL, 0,NULL, 'Dorset', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('714', 701, NULL, 0,NULL, 'Co. Durham', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('715', 701, NULL, 0,NULL, 'East Riding of Yorkshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('716', 701, NULL, 0,NULL, 'East Sussex', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('717', 701, NULL, 0,NULL, 'Essex', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('718', 701, NULL, 0,NULL, 'Gloucestershire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('719', 701, NULL, 0,NULL, 'Greater Manchester', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('720', 701, NULL, 0,NULL, 'Hampshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('721', 701, NULL, 0,NULL, 'Hertfordshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('722', 701, NULL, 0,NULL, 'Hereford and Worcester', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('723', 701, NULL, 0,NULL, 'Herefordshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('724', 701, NULL, 0,NULL, 'Huntingdonshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('725', 701, NULL, 0,NULL, 'Isle of Man', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('726', 701, NULL, 0,NULL, 'Isle of Wight', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('727', 701, NULL, 0,NULL, 'Jersey', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('728', 701, NULL, 0,NULL, 'Kent', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('729', 701, NULL, 0,NULL, 'Lancashire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('730', 701, NULL, 0,NULL, 'Leicestershire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('731', 701, NULL, 0,NULL, 'Lincolnshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('732', 701, NULL, 0,NULL, 'London - City of London', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('733', 701, NULL, 0,NULL, 'Merseyside', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('734', 701, NULL, 0,NULL, 'Middlesex', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('735', 701, NULL, 0,NULL, 'Norfolk', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('736', 701, NULL, 0,NULL, 'North Yorkshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('737', 701, NULL, 0,NULL, 'North Riding of Yorkshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('738', 701, NULL, 0,NULL, 'Northamptonshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('739', 701, NULL, 0,NULL, 'Northumberland', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('740', 701, NULL, 0,NULL, 'Nottinghamshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('741', 701, NULL, 0,NULL, 'Oxfordshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('742', 701, NULL, 0,NULL, 'Rutland', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('743', 701, NULL, 0,NULL, 'Shropshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('744', 701, NULL, 0,NULL, 'Somerset', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('745', 701, NULL, 0,NULL, 'Staffordshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('746', 701, NULL, 0,NULL, 'Suffolk', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('747', 701, NULL, 0,NULL, 'Surrey', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('748', 701, NULL, 0,NULL, 'Sussex', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('749', 701, NULL, 0,NULL, 'Tyne and Wear', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('750', 701, NULL, 0,NULL, 'Warwickshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('751', 701, NULL, 0,NULL, 'West Midlands', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('752', 701, NULL, 0,NULL, 'West Sussex', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('753', 701, NULL, 0,NULL, 'West Yorkshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('754', 701, NULL, 0,NULL, 'West Riding of Yorkshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('755', 701, NULL, 0,NULL, 'Wiltshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('756', 701, NULL, 0,NULL, 'Worcestershire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('757', 701, NULL, 0,NULL, 'Yorkshire', 1);
-- Wales
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('758', 702, NULL, 0,NULL, 'Anglesey', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('759', 702, NULL, 0,NULL, 'Breconshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('760', 702, NULL, 0,NULL, 'Caernarvonshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('761', 702, NULL, 0,NULL, 'Cardiganshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('762', 702, NULL, 0,NULL, 'Carmarthenshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('763', 702, NULL, 0,NULL, 'Ceredigion', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('764', 702, NULL, 0,NULL, 'Denbighshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('765', 702, NULL, 0,NULL, 'Flintshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('766', 702, NULL, 0,NULL, 'Glamorgan', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('767', 702, NULL, 0,NULL, 'Gwent', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('768', 702, NULL, 0,NULL, 'Gwynedd', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('769', 702, NULL, 0,NULL, 'Merionethshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('770', 702, NULL, 0,NULL, 'Monmouthshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('771', 702, NULL, 0,NULL, 'Mid Glamorgan', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('772', 702, NULL, 0,NULL, 'Montgomeryshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('773', 702, NULL, 0,NULL, 'Pembrokeshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('774', 702, NULL, 0,NULL, 'Powys', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('775', 702, NULL, 0,NULL, 'Radnorshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('776', 702, NULL, 0,NULL, 'South Glamorgan', 1);
-- Scotland
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('777', 703, NULL, 0,NULL, 'Aberdeen, City of', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('778', 703, NULL, 0,NULL, 'Angus', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('779', 703, NULL, 0,NULL, 'Argyll', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('780', 703, NULL, 0,NULL, 'Ayrshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('781', 703, NULL, 0,NULL, 'Banffshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('782', 703, NULL, 0,NULL, 'Berwickshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('783', 703, NULL, 0,NULL, 'Bute', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('784', 703, NULL, 0,NULL, 'Caithness', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('785', 703, NULL, 0,NULL, 'Clackmannanshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('786', 703, NULL, 0,NULL, 'Dumfriesshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('787', 703, NULL, 0,NULL, 'Dumbartonshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('788', 703, NULL, 0,NULL, 'Dundee, City of', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('789', 703, NULL, 0,NULL, 'East Lothian', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('790', 703, NULL, 0,NULL, 'Fife', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('791', 703, NULL, 0,NULL, 'Inverness', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('792', 703, NULL, 0,NULL, 'Kincardineshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('793', 703, NULL, 0,NULL, 'Kinross-shire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('794', 703, NULL, 0,NULL, 'Kirkcudbrightshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('795', 703, NULL, 0,NULL, 'Lanarkshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('796', 703, NULL, 0,NULL, 'Midlothian', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('797', 703, NULL, 0,NULL, 'Morayshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('798', 703, NULL, 0,NULL, 'Nairnshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('799', 703, NULL, 0,NULL, 'Orkney', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('800', 703, NULL, 0,NULL, 'Peebleshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('801', 703, NULL, 0,NULL, 'Perthshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('802', 703, NULL, 0,NULL, 'Renfrewshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('803', 703, NULL, 0,NULL, 'Ross & Cromarty', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('804', 703, NULL, 0,NULL, 'Roxburghshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('805', 703, NULL, 0,NULL, 'Selkirkshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('806', 703, NULL, 0,NULL, 'Shetland', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('807', 703, NULL, 0,NULL, 'Stirlingshire', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('808', 703, NULL, 0,NULL, 'Sutherland', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('809', 703, NULL, 0,NULL, 'West Lothian', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('810', 703, NULL, 0,NULL, 'Wigtownshire', 1);
-- Northern Ireland
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('811', 704, NULL, 0,NULL, 'Antrim', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('812', 704, NULL, 0,NULL, 'Armagh', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('813', 704, NULL, 0,NULL, 'Co. Down', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('814', 704, NULL, 0,NULL, 'Co. Fermanagh', 1);
INSERT INTO llx_c_departements (`code_departement`, `fk_region`, `cheflieu`, `tncc`, `ncc`, `nom`, `active`) VALUES ('815', 704, NULL, 0,NULL, 'Co. Londonderry', 1);
-- Provinces US (id country=11) -- Provinces US (id country=11)
insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AL', 1101, '', 0, 'ALABAMA', 'Alabama', 1); insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AL', 1101, '', 0, 'ALABAMA', 'Alabama', 1);
insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AK', 1101, '', 0, 'ALASKA', 'Alaska', 1); insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AK', 1101, '', 0, 'ALASKA', 'Alaska', 1);

1
htdocs/langs/ar_SA/admin.lang
View File

@ -573,7 +573,6 @@ Port=الميناء
VirtualServerName=اسم الخادم الافتراضي VirtualServerName=اسم الخادم الافتراضي
AllParameters=جميع البارامترات AllParameters=جميع البارامترات
OS=نظام التشغيل OS=نظام التشغيل
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=وحدات PhpModules=وحدات
PhpConf=Conf PhpConf=Conf

9
htdocs/langs/ca_ES/admin.lang
View File

@ -383,8 +383,8 @@ Module85Name=Bancs i caixes
Module85Desc=Gestió dels comptes financers de tipus comptes bancaris, postals o efectiu Module85Desc=Gestió dels comptes financers de tipus comptes bancaris, postals o efectiu
Module100Name=External site Module100Name=External site
Module100Desc=Inclou qualsevol lloc web extern en els menús de Dolibarr, veient-lo en un frame Module100Desc=Inclou qualsevol lloc web extern en els menús de Dolibarr, veient-lo en un frame
Module105Name=Mailman i Sip Module105Name=Mailman i SPIP
Module105Desc=Interface amb Mailman o Spip per al mòdul Membres Module105Desc=Interface amb Mailman o SPIP per al mòdul Membres
Module200Name=LDAP Module200Name=LDAP
Module200Desc=sincronització amb un anuari LDAP Module200Desc=sincronització amb un anuari LDAP
Module210Name=PostNuke Module210Name=PostNuke
@ -717,7 +717,6 @@ Port=Port
VirtualServerName=Nom del servidor virtual VirtualServerName=Nom del servidor virtual
AllParameters=Tots els paràmetres AllParameters=Tots els paràmetres
OS=SO OS=SO
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Mòduls PhpModules=Mòduls
PhpConf=Conf PhpConf=Conf
@ -818,7 +817,7 @@ CompanyFundationDesc=Edita en aquesta pàgina tota la informació coneguda sobre
DisplayDesc=Podeu trobar aquí tots els paràmetres relacionats amb l'aparença d'Dolibarr DisplayDesc=Podeu trobar aquí tots els paràmetres relacionats amb l'aparença d'Dolibarr
AvailableModules=Mòduls disponibles AvailableModules=Mòduls disponibles
ToActivateModule=Per activar els mòduls, aneu a l'àrea de Configuració (Inici->Configuració->Mòduls). ToActivateModule=Per activar els mòduls, aneu a l'àrea de Configuració (Inici->Configuració->Mòduls).
SessionTimeOut=Time out de sesions SessionTimeOut=Timeout de sesions
SessionExplanation=Assegura que el període de sessions no expirarà abans d'aquest moment. Tanmateix, la gestió del període de sessions de PHP no garanteix que el període de sessions expirar després d'aquest període: Aquest serà el cas si un sistema de neteja del cau de sessions és actiu. <br>Nota: Sense mecanisme especial, el mecanisme intern per netejar el període de sessions de PHP tots els accessos <b>%s /%s</b>, però només al voltant de l'accés d'altres períodes de sessions. SessionExplanation=Assegura que el període de sessions no expirarà abans d'aquest moment. Tanmateix, la gestió del període de sessions de PHP no garanteix que el període de sessions expirar després d'aquest període: Aquest serà el cas si un sistema de neteja del cau de sessions és actiu. <br>Nota: Sense mecanisme especial, el mecanisme intern per netejar el període de sessions de PHP tots els accessos <b>%s /%s</b>, però només al voltant de l'accés d'altres períodes de sessions.
TriggersAvailable=Triggers disponibles TriggersAvailable=Triggers disponibles
TriggersDesc=Els triggers són arxius que, une vegada dipositats a la carpeta <b>htdocs/core/triggers</b>, modifiquen el comportament del workflow d'Dolibarr. Realitzen accions suplementàries, desencadenades pels esdeveniments Dolibarr (creació d'empresa, validació factura, tancament de contracte, etc). TriggersDesc=Els triggers són arxius que, une vegada dipositats a la carpeta <b>htdocs/core/triggers</b>, modifiquen el comportament del workflow d'Dolibarr. Realitzen accions suplementàries, desencadenades pels esdeveniments Dolibarr (creació d'empresa, validació factura, tancament de contracte, etc).
@ -1302,7 +1301,7 @@ BankOrderGlobalDesc=Ordre de visualització general
BankOrderES=Espanyol BankOrderES=Espanyol
BankOrderESDesc=Ordre de visualització espanyol BankOrderESDesc=Ordre de visualització espanyol
##### MailmanSpip ##### ##### MailmanSpip #####
MailmanSpipSetup=Configuració del mòdul Mailman i Spip MailmanSpipSetup=Configuració del mòdul Mailman i SPIP
##### Multicompany ##### ##### Multicompany #####
MultiCompanySetup=Configuració del mòdul Multi-empresa MultiCompanySetup=Configuració del mòdul Multi-empresa
##### Suppliers ##### ##### Suppliers #####

1
htdocs/langs/da_DK/admin.lang
View File

@ -503,7 +503,6 @@ Port=Port
VirtualServerName=Virtual Server navn VirtualServerName=Virtual Server navn
AllParameters=Alle parametre AllParameters=Alle parametre
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Moduler PhpModules=Moduler
PhpConf=Conf PhpConf=Conf

1
htdocs/langs/de_AT/admin.lang
View File

@ -499,7 +499,6 @@ Port=Port
VirtualServerName=Virtual Server Name VirtualServerName=Virtual Server Name
AllParameters=Alle Parameter AllParameters=Alle Parameter
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Module PhpModules=Module
PhpConf=Conf PhpConf=Conf

7
htdocs/langs/de_DE/admin.lang
View File

@ -383,8 +383,8 @@ Module85Name=Banken und Geld
Module85Desc=Verwaltung von Bank- oder Bargeldkonten Module85Desc=Verwaltung von Bank- oder Bargeldkonten
Module100Name=Externe Website Module100Name=Externe Website
Module100Desc=Erlaubt die Einbindung einer externen Website in die Menüs von dolibarr und die Anzeige der Seite innerhalb eines Frames Module100Desc=Erlaubt die Einbindung einer externen Website in die Menüs von dolibarr und die Anzeige der Seite innerhalb eines Frames
Module105Name=Mailman und Sip Module105Name=Mailman und SPIP
Module105Desc=Mailman oder Spip Schnittstelle für die Mitgliedsmodul Module105Desc=Mailman oder SPIP Schnittstelle für die Mitgliedsmodul
Module200Name=LDAP Module200Name=LDAP
Module200Desc=LDAP-Verzeichnissynchronisation Module200Desc=LDAP-Verzeichnissynchronisation
Module210Name=PostNuke Module210Name=PostNuke
@ -711,7 +711,6 @@ Port=Port
VirtualServerName=Name des Virtual-Server VirtualServerName=Name des Virtual-Server
AllParameters=Alle Parameter AllParameters=Alle Parameter
OS=OS OS=OS
Php=PHP
PhpEnv=Env PhpEnv=Env
PhpModules=Module PhpModules=Module
PhpConf=Config PhpConf=Config
@ -1290,7 +1289,7 @@ BankOrderGlobalDesc=Allgemeine Anzeige-Reihenfolge
BankOrderES=Spanisch BankOrderES=Spanisch
BankOrderESDesc=Spanisch Anzeigereihenfolge BankOrderESDesc=Spanisch Anzeigereihenfolge
##### MailmanSpip ##### ##### MailmanSpip #####
MailmanSpipSetup=Mailman und Spip Modul-Setup MailmanSpipSetup=Mailman und SPIP Modul-Setup
##### Multicompany ##### ##### Multicompany #####
MultiCompanySetup=Multi-Company-Moduleinstellungen MultiCompanySetup=Multi-Company-Moduleinstellungen
##### Suppliers ##### ##### Suppliers #####

1
htdocs/langs/el_GR/admin.lang
View File

@ -507,7 +507,6 @@ Port=Θύρα
VirtualServerName=Virtual server name VirtualServerName=Virtual server name
AllParameters=Όλοι οι παράμετροι AllParameters=Όλοι οι παράμετροι
OS=Λ.Σ. OS=Λ.Σ.
Php=Php
PhpEnv=Περ/λλον PhpEnv=Περ/λλον
PhpModules=Αρθρώματα PhpModules=Αρθρώματα
PhpConf=Conf PhpConf=Conf

8
htdocs/langs/en_US/admin.lang
View File

@ -384,8 +384,8 @@ Module85Name=Banks and cash
Module85Desc=Management of bank or cash accounts Module85Desc=Management of bank or cash accounts
Module100Name=External site Module100Name=External site
Module100Desc=Include any external web site into Dolibarr menus and view it into a Dolibarr frame Module100Desc=Include any external web site into Dolibarr menus and view it into a Dolibarr frame
Module105Name=Mailman and Spip Module105Name=Mailman and SPIP
Module105Desc=Mailman or Spip interface for member module Module105Desc=Mailman or SPIP interface for member module
Module200Name=LDAP Module200Name=LDAP
Module200Desc=LDAP directory synchronisation Module200Desc=LDAP directory synchronisation
Module210Name=PostNuke Module210Name=PostNuke
@ -710,7 +710,6 @@ Port=Port
VirtualServerName=Virtual server name VirtualServerName=Virtual server name
AllParameters=All parameters AllParameters=All parameters
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Modules PhpModules=Modules
PhpConf=Conf PhpConf=Conf
@ -1292,7 +1291,8 @@ BankOrderGlobalDesc=General display order
BankOrderES=Spanish BankOrderES=Spanish
BankOrderESDesc=Spanish display order BankOrderESDesc=Spanish display order
##### MailmanSpip ##### ##### MailmanSpip #####
MailmanSpipSetup=Mailman and Spip module Setup MailmanSpipSetup=Mailman and SPIP module Setup
MailmanTitle=Mailman mailing list system
##### Multicompany ##### ##### Multicompany #####
MultiCompanySetup=Multi-company module setup MultiCompanySetup=Multi-company module setup
##### Suppliers ##### ##### Suppliers #####

55
htdocs/langs/es_ES/admin.lang
View File

@ -61,7 +61,9 @@ PreviewNotAvailable=Vista previa no disponible
ThemeCurrentlyActive=Tema actualmente activo ThemeCurrentlyActive=Tema actualmente activo
CurrentTimeZone=Zona horaria PHP (Servidor) CurrentTimeZone=Zona horaria PHP (Servidor)
Space=Área Space=Área
Table=Tabla
Fields=Campos Fields=Campos
Index=Índice
Mask=Máscara Mask=Máscara
NextValue=Próximo valor NextValue=Próximo valor
NextValueForInvoices=Próximo valor (facturas) NextValueForInvoices=Próximo valor (facturas)
@ -88,7 +90,7 @@ NotConfigured=No configurado
Setup=Configuración Setup=Configuración
Activation=Activación Activation=Activación
Active=Activo Active=Activo
SetupShort=Config SetupShort=Config.
OtherOptions=Otras opciones OtherOptions=Otras opciones
OtherSetup=Varios OtherSetup=Varios
CurrentValueSeparatorDecimal=Separador decimal CurrentValueSeparatorDecimal=Separador decimal
@ -156,6 +158,7 @@ ImportPostgreSqlDesc=Para importar una copia de seguridad, debe usar el comando
ImportMySqlCommand=%s %s < miarchivobackup.sql ImportMySqlCommand=%s %s < miarchivobackup.sql
ImportPostgreSqlCommand=%s %s miarchivobackup.sql ImportPostgreSqlCommand=%s %s miarchivobackup.sql
FileNameToGenerate=Nombre del archivo a generar FileNameToGenerate=Nombre del archivo a generar
Compression=Compresión
CommandsToDisableForeignKeysForImport=Comando para desactivar las claves excluyentes a la importación CommandsToDisableForeignKeysForImport=Comando para desactivar las claves excluyentes a la importación
ExportCompatibility=Compatibilidad del archivo de exportación generado ExportCompatibility=Compatibilidad del archivo de exportación generado
MySqlExportParameters=Parámetros de la exportación MySql MySqlExportParameters=Parámetros de la exportación MySql
@ -169,7 +172,7 @@ AddDropTable=Añadir órdenes DROP TABLE
Datas=Datos Datas=Datos
NameColumn=Nombre las columnas NameColumn=Nombre las columnas
ExtendedInsert=Instrucciones INSERT extendidas ExtendedInsert=Instrucciones INSERT extendidas
NoLockBeforeInsert=Sin intrucción LOCK antes del INSERT NoLockBeforeInsert=Sin instrucción LOCK antes del INSERT
DelayedInsert=Inserciones con retraso DelayedInsert=Inserciones con retraso
EncodeBinariesInHexa=Codificar los campos binarios en hexadecimal EncodeBinariesInHexa=Codificar los campos binarios en hexadecimal
IgnoreDuplicateRecords=Ignorar los errores de duplicación (INSERT IGNORE) IgnoreDuplicateRecords=Ignorar los errores de duplicación (INSERT IGNORE)
@ -363,8 +366,8 @@ Module53Name=Servicios
Module53Desc=Gestión de servicios Module53Desc=Gestión de servicios
Module54Name=Contratos Module54Name=Contratos
Module54Desc=Gestión de contratos Module54Desc=Gestión de contratos
Module55Name=Códigos de barra Module55Name=Códigos de barras
Module55Desc=Gestión de los códigos de barra Module55Desc=Gestión de los códigos de barras
Module56Name=Telefonía Module56Name=Telefonía
Module56Desc=Gestión de la telefonía Module56Desc=Gestión de la telefonía
Module57Name=Domiciliaciones Module57Name=Domiciliaciones
@ -381,12 +384,12 @@ Module80Name=Expediciones
Module80Desc=Gestión de expediciones y recepciones Module80Desc=Gestión de expediciones y recepciones
Module85Name=Bancos y cajas Module85Name=Bancos y cajas
Module85Desc=Gestión de las cuentas financieras de tipo cuentas bancarias, postales o efectivo Module85Desc=Gestión de las cuentas financieras de tipo cuentas bancarias, postales o efectivo
Module100Name=External site Module100Name=Sitio web externo
Module100Desc=Incluye cualquier sitio web externo en los menús de Dolibarr, viéndolo en un frame Module100Desc=Incluye cualquier sitio web externo en los menús de Dolibarr, viéndolo en un frame
Module105Name=Mailman y Sip Module105Name=Mailman y SPIP
Module105Desc=Interface con Mailman o Spip para el módulo Miembros Module105Desc=Interfaz con Mailman o SPIP para el módulo Miembros
Module200Name=LDAP Module200Name=LDAP
Module200Desc=sincronización con un anuario LDAP Module200Desc=Sincronización con un anuario LDAP
Module210Name=PostNuke Module210Name=PostNuke
Module210Desc=Integración con PostNuke Module210Desc=Integración con PostNuke
Module240Name=Exportaciones de datos Module240Name=Exportaciones de datos
@ -433,6 +436,7 @@ Module2600Name=WebServices
Module2600Desc=Activa los servicios de servidor web services de Dolibarr Module2600Desc=Activa los servicios de servidor web services de Dolibarr
Module2700Name=Gravatar Module2700Name=Gravatar
Module2700Desc=Utiliza el servicio en línea de Gravatar (www.gravatar.com) para mostrar fotos de los usuarios/miembros (que se encuentran en sus mensajes de correo electrónico). Necesita un acceso a Internet Module2700Desc=Utiliza el servicio en línea de Gravatar (www.gravatar.com) para mostrar fotos de los usuarios/miembros (que se encuentran en sus mensajes de correo electrónico). Necesita un acceso a Internet
Module2800Desc=Cliente FTP
Module2900Name=GeoIPMaxmind Module2900Name=GeoIPMaxmind
Module2900Desc=Capacidades de conversión GeoIP Maxmind Module2900Desc=Capacidades de conversión GeoIP Maxmind
Module5000Name=Multi-empresa Module5000Name=Multi-empresa
@ -578,9 +582,9 @@ Permission286=Exportar los contactos
Permission291=Consultar tarifas Permission291=Consultar tarifas
Permission292=Definir permisos sobre las tarifas Permission292=Definir permisos sobre las tarifas
Permission293=Modificar tarifas de clientes Permission293=Modificar tarifas de clientes
Permission300=Consultar códigos de barra Permission300=Consultar códigos de barras
Permission301=Crear/modificar códigos de barra Permission301=Crear/modificar códigos de barras
Permission302=Eliminar código de barra Permission302=Eliminar código de barras
Permission311=Consultar servicios Permission311=Consultar servicios
Permission312=Asignar servicios a un contrato Permission312=Asignar servicios a un contrato
Permission331=Consultar marcadores Permission331=Consultar marcadores
@ -717,17 +721,17 @@ Port=Puerto
VirtualServerName=Nombre del servidor virtual VirtualServerName=Nombre del servidor virtual
AllParameters=Todos los parámetros AllParameters=Todos los parámetros
OS=SO OS=SO
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Módulos PhpModules=Módulos
PhpConf=Conf PhpConf=Conf
PhpWebLink=Vínculo Web-PHP PhpWebLink=Vínculo Web-PHP
Pear=Pear Pear=Pear
PearPackages=Paquetes Pear PearPackages=Paquetes Pear
+Browser=Navegador
Database=Base de datos Database=Base de datos
DatabaseServer=Host de la base de datos DatabaseServer=Host de la base de datos
DatabaseName=Nombre de la base de datos DatabaseName=Nombre de la base de datos
DatabasePort=puerto de la base de datos DatabasePort=Puerto de la base de datos
DatabaseUser=Login de la base de datos DatabaseUser=Login de la base de datos
DatabasePassword=Contraseña de la base de datos DatabasePassword=Contraseña de la base de datos
DatabaseConfiguration=Configuración de la base de datos DatabaseConfiguration=Configuración de la base de datos
@ -818,7 +822,7 @@ CompanyFundationDesc=Editar en esta página toda la información conocida sobre
DisplayDesc=Puede encontrar aquí todos los parámetros relacionados con la apariencia de Dolibarr DisplayDesc=Puede encontrar aquí todos los parámetros relacionados con la apariencia de Dolibarr
AvailableModules=Módulos disponibles AvailableModules=Módulos disponibles
ToActivateModule=Para activar los módulos, vaya al área de Configuración (Inicio->Configuración->Módulos). ToActivateModule=Para activar los módulos, vaya al área de Configuración (Inicio->Configuración->Módulos).
SessionTimeOut=Time out de sesiones SessionTimeOut=Timeout de sesiones
SessionExplanation=Asegura que el período de sesiones no expirará antes de este momento. Sin embargo, la gestión del período de sesiones de PHP no garantiza que el período de sesiones expira después de este período: Este será el caso si un sistema de limpieza del caché de sesiones es activo. <br> Nota: Sin mecanismo especial, el mecanismo interno para limpiar el período de sesiones de PHP todos los accesos <b>%s/%s</b>, pero sólo en torno al acceso de otros períodos de sesiones. SessionExplanation=Asegura que el período de sesiones no expirará antes de este momento. Sin embargo, la gestión del período de sesiones de PHP no garantiza que el período de sesiones expira después de este período: Este será el caso si un sistema de limpieza del caché de sesiones es activo. <br> Nota: Sin mecanismo especial, el mecanismo interno para limpiar el período de sesiones de PHP todos los accesos <b>%s/%s</b>, pero sólo en torno al acceso de otros períodos de sesiones.
TriggersAvailable=Triggers disponibles TriggersAvailable=Triggers disponibles
TriggersDesc=Los triggers son archivos que, une vez depositados en el directorio <b>htdocs/core/triggers</b>, modifican el comportamiento del workflow de Dolibarr. Realizan acciones suplementarias, desencadenadas por los eventos Dolibarr (creación de empresa, validación factura, cierre contrato, etc). TriggersDesc=Los triggers son archivos que, une vez depositados en el directorio <b>htdocs/core/triggers</b>, modifican el comportamiento del workflow de Dolibarr. Realizan acciones suplementarias, desencadenadas por los eventos Dolibarr (creación de empresa, validación factura, cierre contrato, etc).
@ -1153,19 +1157,19 @@ ErrorUnknownSyslogConstant=La constante %s no es una constante syslog conocida
DonationsSetup=Configuración del módulo subvenciones DonationsSetup=Configuración del módulo subvenciones
DonationsReceiptModel=Modelo recepción de subvenciones DonationsReceiptModel=Modelo recepción de subvenciones
##### Barcode ##### ##### Barcode #####
BarcodeSetup=Configuración de los códigos de barra BarcodeSetup=Configuración de los códigos de barras
PaperFormatModule=Módulos de formatos de impresión PaperFormatModule=Módulos de formatos de impresión
BarcodeEncodeModule=Módulos de codificación de los códigos de barra BarcodeEncodeModule=Módulos de codificación de los códigos de barras
UseBarcodeInProductModule=Utilizar los códigos de barra en los productos UseBarcodeInProductModule=Utilizar los códigos de barras en los productos
CodeBarGenerator=Generador del código CodeBarGenerator=Generador del código
ChooseABarCode=Ningún generador seleccionado ChooseABarCode=Ningún generador seleccionado
FormatNotSupportedByGenerator=Formato no generado por este generador FormatNotSupportedByGenerator=Formato no generado por este generador
BarcodeDescEAN8=Códigos de barra tipo EAN8 BarcodeDescEAN8=Códigos de barras tipo EAN8
BarcodeDescEAN13=Códigos de barra tipo EAN13 BarcodeDescEAN13=Códigos de barras tipo EAN13
BarcodeDescUPC=Códigos de barra tipo UPC BarcodeDescUPC=Códigos de barras tipo UPC
BarcodeDescISBN=Códigos de barra tipo ISBN BarcodeDescISBN=Códigos de barras tipo ISBN
BarcodeDescC39=Códigos de barra tipo C39 BarcodeDescC39=Códigos de barras tipo C39
BarcodeDescC128=Códigos de barra tipo C128 BarcodeDescC128=Códigos de barras tipo C128
##### Prelevements ##### ##### Prelevements #####
WithdrawalsSetup=Configuración del módulo domiciliaciones WithdrawalsSetup=Configuración del módulo domiciliaciones
##### ExternalRSS ##### ##### ExternalRSS #####
@ -1297,7 +1301,8 @@ BankOrderGlobalDesc=Orden de visualización general
BankOrderES=Español BankOrderES=Español
BankOrderESDesc=Orden de visualización español BankOrderESDesc=Orden de visualización español
##### MailmanSpip ##### ##### MailmanSpip #####
MailmanSpipSetup=Configuración del módulo Mailman y Spip MailmanSpipSetup=Configuración del módulo Mailman y SPIP
MailmanTitle=Sistema de listas de correo Mailman
##### Multicompany ##### ##### Multicompany #####
MultiCompanySetup=Configuración del módulo Multi-empresa MultiCompanySetup=Configuración del módulo Multi-empresa
##### Suppliers ##### ##### Suppliers #####
@ -1319,3 +1324,5 @@ ProjectsModelModule=Modelo de documento para informes de proyectos
ExternalSiteSetup=Configuración del enlace hacia el sitio externo ExternalSiteSetup=Configuración del enlace hacia el sitio externo
##### Ecommerce ##### ##### Ecommerce #####
EcommerceSiteSetup=Configuración del módulo e-commerce EcommerceSiteSetup=Configuración del módulo e-commerce
View=Ver
Server=Servidor

2
htdocs/langs/es_ES/companies.lang
View File

@ -88,7 +88,7 @@ WrongCustomerCode=Código cliente incorrecto
WrongSupplierCode=Código proveedor incorrecto WrongSupplierCode=Código proveedor incorrecto
CustomerCodeModel=Modelo de código cliente CustomerCodeModel=Modelo de código cliente
SupplierCodeModel=Modelo de código proveedor SupplierCodeModel=Modelo de código proveedor
Gencod=Código de barra Gencod=Código de barras
##### Professionnal ID #####= ##### Professionnal ID #####=
ProfId1Short=Prof. id 1 ProfId1Short=Prof. id 1
ProfId2Short=Prof. id 2 ProfId2Short=Prof. id 2

2
htdocs/langs/es_ES/errors.lang
View File

@ -102,7 +102,7 @@ ErrorLoginDoesNotExists=La cuenta de usuario de <b>%s</b> no se ha encontrado.
ErrorLoginHasNoEmail=Este usuario no tiene e-mail. Imposible continuar. ErrorLoginHasNoEmail=Este usuario no tiene e-mail. Imposible continuar.
ErrorBadValueForCode=Valor incorrecto para el código. Vuelva a intentar con un nuevo valor... ErrorBadValueForCode=Valor incorrecto para el código. Vuelva a intentar con un nuevo valor...
ErrorBothFieldCantBeNegative=Los campos %s y %s no pueden ser negativos ErrorBothFieldCantBeNegative=Los campos %s y %s no pueden ser negativos
ErrorNoActivatedBarcode=Ningún tipo de código de barra activado ErrorNoActivatedBarcode=Ningún tipo de código de barras activado
ErrorWebServerUserHasNotPermission=La cuenta de ejecución del servidor web <b>%s</b> no dispone de los permisos para esto ErrorWebServerUserHasNotPermission=La cuenta de ejecución del servidor web <b>%s</b> no dispone de los permisos para esto
ErrorNoActivatedBarcode=No hay activado ningún tipo de código de barras ErrorNoActivatedBarcode=No hay activado ningún tipo de código de barras
ErrUnzipFails=No se ha podido descomprimir el archivo %s con ZipArchive ErrUnzipFails=No se ha podido descomprimir el archivo %s con ZipArchive

3
htdocs/langs/es_ES/interventions.lang
View File

@ -1,5 +1,5 @@
# Dolibarr language file - es_ES - interventions # Dolibarr language file - es_ES - interventions
CHARSET= UTF-8 CHARSET=UTF-8
Intervention=Intervención Intervention=Intervención
Interventions=Intervenciones Interventions=Intervenciones
InterventionCard=Ficha intervención InterventionCard=Ficha intervención
@ -23,6 +23,7 @@ ConfirmModifyIntervention=¿Está seguro de querer modificar esta intervención?
ConfirmDeleteInterventionLine=¿Está seguro de querer eliminar esta linea? ConfirmDeleteInterventionLine=¿Está seguro de querer eliminar esta linea?
NameAndSignatureOfInternalContact=Nombre y firma del participante: NameAndSignatureOfInternalContact=Nombre y firma del participante:
NameAndSignatureOfExternalContact=Nombre y firma del cliente: NameAndSignatureOfExternalContact=Nombre y firma del cliente:
DocumentModelStandard=Documento modelo estándar para intervenciones
InterventionCardsAndInterventionLines=Fichas y líneas de intervención InterventionCardsAndInterventionLines=Fichas y líneas de intervención
InterId=Id intervención InterId=Id intervención
InterRef=Ref. intervención InterRef=Ref. intervención

2
htdocs/langs/es_ES/main.lang
View File

@ -504,7 +504,7 @@ ShowCustomerPreview=Ver historial cliente
ShowSupplierPreview=Ver historial proveedor ShowSupplierPreview=Ver historial proveedor
ShowProspectPreview=Ver historial cliente potencial ShowProspectPreview=Ver historial cliente potencial
ShowAccountancyPreview=Ver historial contable ShowAccountancyPreview=Ver historial contable
RefCustomer=Ref. client RefCustomer=Ref. cliente
Currency=Divisa Currency=Divisa
InfoAdmin=Información para los administradores InfoAdmin=Información para los administradores
Undo=Anular Undo=Anular

2
htdocs/langs/es_ES/orders.lang
View File

@ -65,7 +65,7 @@ UnvalidateOrder=Desvalidar el pedido
DeleteOrder=Eliminar el pedido DeleteOrder=Eliminar el pedido
CancelOrder=Anular el pedido CancelOrder=Anular el pedido
AddOrder=Crear pedido AddOrder=Crear pedido
AddToMyOrders=añadir a mis pedidos AddToMyOrders=Añadir a mis pedidos
AddToOtherOrders=Añadir a otros pedidos AddToOtherOrders=Añadir a otros pedidos
ShowOrder=Mostrar pedido ShowOrder=Mostrar pedido
NoOpenedOrders=Níngun pedido borrador NoOpenedOrders=Níngun pedido borrador

4
htdocs/langs/es_ES/products.lang
View File

@ -100,7 +100,7 @@ NoCat=Su producto no pertenece a ninguna categoría
PrimaryWay=Ruta Primaria: PrimaryWay=Ruta Primaria:
DeleteFromCat=Eliminar de la categoría DeleteFromCat=Eliminar de la categoría
PriceRemoved=Precio eliminado PriceRemoved=Precio eliminado
BarCode=Código de barra BarCode=Código de barras
BarcodeType=Tipo de código de barras BarcodeType=Tipo de código de barras
BarcodeValue=Valor del código de barras BarcodeValue=Valor del código de barras
GenbarcodeLocation=Herramienta de generación de códigos de barras en líneas de pedidos (utilizado por el motor phpbar para determinados tipos de códigos de barras) GenbarcodeLocation=Herramienta de generación de códigos de barras en líneas de pedidos (utilizado por el motor phpbar para determinados tipos de códigos de barras)
@ -156,7 +156,7 @@ ServiceNb=Servicio no %s
ListProductServiceByPopularity=Listado de productos/servicios por popularidad ListProductServiceByPopularity=Listado de productos/servicios por popularidad
ListProductByPopularity=Listado de productos/servicios por popularidad ListProductByPopularity=Listado de productos/servicios por popularidad
ListServiceByPopularity=Listado de servicios por popularidad ListServiceByPopularity=Listado de servicios por popularidad
Finished=Producto manofacturado Finished=Producto manufacturado
RowMaterial=Materia prima RowMaterial=Materia prima
CloneProduct=Clonar producto/servicio CloneProduct=Clonar producto/servicio
ConfirmCloneProduct=¿Está seguro de querer clonar el producto o servicio <b>%s</b>? ConfirmCloneProduct=¿Está seguro de querer clonar el producto o servicio <b>%s</b>?

7
htdocs/langs/et_EE/admin.lang
View File

@ -380,8 +380,8 @@ Module85Name=Pangad ja raha
Module85Desc=Juhtimine pangas või sularaha raamatupidamise Module85Desc=Juhtimine pangas või sularaha raamatupidamise
Module100Name=Väline veebileht Module100Name=Väline veebileht
Module100Desc=Sisalda mingeid väliseid WWW Dolibarr menüüd ja vaadata selle Dolibarr raam Module100Desc=Sisalda mingeid väliseid WWW Dolibarr menüüd ja vaadata selle Dolibarr raam
Module105Name=Mailman ja Sip Module105Name=Mailman ja SPIP
Module105Desc=Mailman või Spip liides liige moodul Module105Desc=Mailman või SPIP liides liige moodul
Module200Name=LDAP Module200Name=LDAP
Module200Desc=LDAP kataloogi sünkroniseerimine Module200Desc=LDAP kataloogi sünkroniseerimine
Module210Name=PostNuke Module210Name=PostNuke
@ -707,7 +707,6 @@ Port=Port
VirtualServerName=Virtual server name VirtualServerName=Virtual server name
AllParameters=Kõik parameetrid AllParameters=Kõik parameetrid
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Moodulid PhpModules=Moodulid
PhpConf=Conf PhpConf=Conf
@ -1247,7 +1246,7 @@ BankOrderGlobal=Üldine
BankOrderGlobalDesc=General kuvamise BankOrderGlobalDesc=General kuvamise
BankOrderES=Hispaania BankOrderES=Hispaania
BankOrderESDesc=Hispaania kuvamise BankOrderESDesc=Hispaania kuvamise
MailmanSpipSetup=Mailman ja Spip moodul Setup MailmanSpipSetup=Mailman ja SPIP moodul Setup
MultiCompanySetup=Mitme firma moodul setup MultiCompanySetup=Mitme firma moodul setup
SuppliersSetup=Tarnija moodul setup SuppliersSetup=Tarnija moodul setup
SuppliersCommandModel=Täielik malli tarnija järjekorras (logo. ..) SuppliersCommandModel=Täielik malli tarnija järjekorras (logo. ..)

1
htdocs/langs/fa_IR/admin.lang
View File

@ -581,7 +581,6 @@ Port=الميناء
VirtualServerName=اسم الخادم الافتراضي VirtualServerName=اسم الخادم الافتراضي
AllParameters=جميع البارامترات AllParameters=جميع البارامترات
OS=نظام التشغيل OS=نظام التشغيل
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=وحدات PhpModules=وحدات
PhpConf=Conf PhpConf=Conf

1
htdocs/langs/fi_FI/admin.lang
View File

@ -502,7 +502,6 @@ Port=Port
VirtualServerName=Virtuaali-palvelimen nimi VirtualServerName=Virtuaali-palvelimen nimi
AllParameters=Kaikki parametrit AllParameters=Kaikki parametrit
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Moduulit PhpModules=Moduulit
PhpConf=Conf PhpConf=Conf

7
htdocs/langs/fr_FR/admin.lang
View File

@ -387,8 +387,8 @@ Module85Name= Banques et caisses
Module85Desc= Gestion des comptes financiers de type Comptes bancaires, postaux ou Caisses liquides Module85Desc= Gestion des comptes financiers de type Comptes bancaires, postaux ou Caisses liquides
Module100Name=External site Module100Name=External site
Module100Desc=Ajoute un site Web externe dans les menus Dolibarr et l'affiche dans un frame Dolibarr Module100Desc=Ajoute un site Web externe dans les menus Dolibarr et l'affiche dans un frame Dolibarr
Module105Name=Mailman and Spip Module105Name=Mailman and SPIP
Module105Desc=Interface vers Mailman ou Spip pour le module Adhérent Module105Desc=Interface vers Mailman ou SPIP pour le module Adhérent
Module200Name= LDAP Module200Name= LDAP
Module200Desc= Synchronisation avec un annuaire LDAP Module200Desc= Synchronisation avec un annuaire LDAP
Module210Name= PostNuke Module210Name= PostNuke
@ -719,7 +719,6 @@ Port= Port
VirtualServerName= Nom du serveur virtuel VirtualServerName= Nom du serveur virtuel
AllParameters= Tous les paramètres AllParameters= Tous les paramètres
OS= OS OS= OS
Php= Php
PhpEnv= Env PhpEnv= Env
PhpModules= Modules PhpModules= Modules
PhpConf= Conf PhpConf= Conf
@ -1299,7 +1298,7 @@ BankOrderGlobalDesc=Ordre d'affichage général
BankOrderES=Espagnol BankOrderES=Espagnol
BankOrderESDesc=Ordre d'affichage Espagnol BankOrderESDesc=Ordre d'affichage Espagnol
##### MailmanSpip ##### ##### MailmanSpip #####
MailmanSpipSetup=Configuration du module Mailman et Spip MailmanSpipSetup=Configuration du module Mailman et SPIP
##### Multicompany ##### ##### Multicompany #####
MultiCompanySetup=Configuration du module Multi-société MultiCompanySetup=Configuration du module Multi-société
##### Suppliers ##### ##### Suppliers #####

5
htdocs/langs/he_IL/admin.lang
View File

@ -381,7 +381,7 @@ Module85Desc=ניהול חשבונות בנק או במזומן
Module100Name=באתר חיצוני Module100Name=באתר חיצוני
Module100Desc=כולל כל אתר אינטרנט חיצוני בתפריטים Dolibarr ולצפות בו למסגרת Dolibarr Module100Desc=כולל כל אתר אינטרנט חיצוני בתפריטים Dolibarr ולצפות בו למסגרת Dolibarr
Module105Name=הדוור וללגום Module105Name=הדוור וללגום
Module105Desc=הדוור או Spip ממשק מודול חבר Module105Desc=הדוור או SPIP ממשק מודול חבר
Module200Name=LDAP Module200Name=LDAP
Module200Desc=במדריך LDAP סינכרון Module200Desc=במדריך LDAP סינכרון
Module210Name=PostNuke Module210Name=PostNuke
@ -707,7 +707,6 @@ Port=נמל
VirtualServerName=שרת וירטואלי שם VirtualServerName=שרת וירטואלי שם
AllParameters=כל הפרמטרים AllParameters=כל הפרמטרים
OS=מערכת ההפעלה OS=מערכת ההפעלה
Php=PHP
PhpEnv=Env PhpEnv=Env
PhpModules=מודולים PhpModules=מודולים
PhpConf=Conf PhpConf=Conf
@ -1249,7 +1248,7 @@ BankOrderGlobal=כללי
BankOrderGlobalDesc=התצוגה כללי סדר BankOrderGlobalDesc=התצוגה כללי סדר
BankOrderES=ספרדית BankOrderES=ספרדית
BankOrderESDesc=התצוגה ספרדית כדי BankOrderESDesc=התצוגה ספרדית כדי
MailmanSpipSetup=הדוור ותוכנית ההתקנה Spip מודול MailmanSpipSetup=הדוור ותוכנית ההתקנה SPIP מודול
MultiCompanySetup=רב החברה מודול ההתקנה MultiCompanySetup=רב החברה מודול ההתקנה
SuppliersSetup=מודול הספק ההתקנה SuppliersSetup=מודול הספק ההתקנה
SuppliersCommandModel=תבנית שלמה של הסדר הספק (logo. ..) SuppliersCommandModel=תבנית שלמה של הסדר הספק (logo. ..)

1
htdocs/langs/hu_HU/admin.lang
View File

@ -707,7 +707,6 @@ Port=Kikötő
VirtualServerName=Virtuális szerver neve VirtualServerName=Virtuális szerver neve
AllParameters=Minden paraméter AllParameters=Minden paraméter
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Modulok PhpModules=Modulok
PhpConf=Conf PhpConf=Conf

7
htdocs/langs/is_IS/admin.lang
View File

@ -634,7 +634,6 @@ Port=Port
VirtualServerName=Raunverulegur framreiðslumaður nafn VirtualServerName=Raunverulegur framreiðslumaður nafn
AllParameters=Allir þættir AllParameters=Allir þættir
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Modules PhpModules=Modules
PhpConf=Conf PhpConf=Conf
@ -1215,8 +1214,8 @@ UrlGenerationParameters=Breytur til að tryggja vefslóðir
SecurityTokenIsUnique=Nota einstakt securekey breytu fyrir hvert slóð SecurityTokenIsUnique=Nota einstakt securekey breytu fyrir hvert slóð
EnterRefToBuildUrl=Sláðu inn tilvísun til %s mótmæla EnterRefToBuildUrl=Sláðu inn tilvísun til %s mótmæla
GetSecuredUrl=Fá reiknað slóð GetSecuredUrl=Fá reiknað slóð
Module105Name=Mailman og Sip Module105Name=Mailman og SPIP
Module105Desc=Mailman eða Spip tengi fyrir einingu aðildarríkja Module105Desc=Mailman eða SPIP tengi fyrir einingu aðildarríkja
Module50000Name=PayBox Module50000Name=PayBox
Module50000Desc=Module til að bjóða upp á netinu greiðslu síðu með kreditkorti með PayBox Module50000Desc=Module til að bjóða upp á netinu greiðslu síðu með kreditkorti með PayBox
Module50200Name=Paypal Module50200Name=Paypal
@ -1287,6 +1286,6 @@ BankOrderGlobal=Almennt
BankOrderGlobalDesc=Almennt sýna til BankOrderGlobalDesc=Almennt sýna til
BankOrderES=Spænska BankOrderES=Spænska
BankOrderESDesc=Spænska sýna til BankOrderESDesc=Spænska sýna til
MailmanSpipSetup=Mailman og Spip mát Skipulag MailmanSpipSetup=Mailman og SPIP mát Skipulag
SuppliersInvoiceModel=Heill sniðmát af reikningi birgis (logo. ..) SuppliersInvoiceModel=Heill sniðmát af reikningi birgis (logo. ..)
// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:28:04). // STOP - Lines generated via autotranslator.php tool (2012-02-29 16:28:04).

6
htdocs/langs/it_IT/admin.lang
View File

@ -533,7 +533,7 @@ LogEvents =Eventi di audit di sicurezza
MailingEMailError =Indirizzo email per le mail di errore (Errors-to) MailingEMailError =Indirizzo email per le mail di errore (Errors-to)
MailingEMailFrom =Mittente email (Da) per le email inviate dal modulo mailing MailingEMailFrom =Mittente email (Da) per le email inviate dal modulo mailing
MailingSetup =Impostazioni modulo mailing MailingSetup =Impostazioni modulo mailing
MailmanSpipSetup =Impostazioni Mailman e modulo Spip MailmanSpipSetup =Impostazioni Mailman e modulo SPIP
MainDbPasswordFileConfEncrypted =Password del database crittata in conf.php (raccomandato) MainDbPasswordFileConfEncrypted =Password del database crittata in conf.php (raccomandato)
MAIN_DISABLE_ALL_MAILS =Disabilitare la spedizione di tutti i messaggi email (per test o demo) MAIN_DISABLE_ALL_MAILS =Disabilitare la spedizione di tutti i messaggi email (per test o demo)
MAIN_DISABLE_ALL_SMS =Disabilitare tutti gli invii SMS (per scopi di test o demo) MAIN_DISABLE_ALL_SMS =Disabilitare tutti gli invii SMS (per scopi di test o demo)
@ -617,8 +617,8 @@ Module10000Desc =Modulo per offrire il pagamento online con carta di c
Module10000Name =Paybox Module10000Name =Paybox
Module100Desc =Includi un sito esterno nei menu di Dolibarr e visualizzalo in un frame Module100Desc =Includi un sito esterno nei menu di Dolibarr e visualizzalo in un frame
Module100Name =Sito esterno Module100Name =Sito esterno
Module105Desc =Interfaccia Mailman o Spip per il modulo membri Module105Desc =Interfaccia Mailman o SPIP per il modulo membri
Module105Name =Mailman e Spip Module105Name =Mailman e SPIP
Module10Desc =Gestione contabile semplice (fatture e pagamenti) Module10Desc =Gestione contabile semplice (fatture e pagamenti)
Module10Name =Contabilità Module10Name =Contabilità
Module1200Desc =Integrazione Mantis Module1200Desc =Integrazione Mantis

1
htdocs/langs/ja_JP/admin.lang
View File

@ -707,7 +707,6 @@ Port=ポート
VirtualServerName=仮想サーバー名 VirtualServerName=仮想サーバー名
AllParameters=すべてのパラメータ AllParameters=すべてのパラメータ
OS=OS OS=OS
Php=PHP
PhpEnv=ENV PhpEnv=ENV
PhpModules=モジュール PhpModules=モジュール
PhpConf=confに PhpConf=confに

7
htdocs/langs/nb_NO/admin.lang
View File

@ -495,7 +495,6 @@ Port=Port
VirtualServerName=Virtual server name VirtualServerName=Virtual server name
AllParameters=Alle parametere AllParameters=Alle parametere
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Moduler PhpModules=Moduler
PhpConf=Conf PhpConf=Conf
@ -1237,8 +1236,8 @@ UrlGenerationParameters=Parametre for å sikre nettadresser
SecurityTokenIsUnique=Bruk en unik securekey parameter for hver webadresse SecurityTokenIsUnique=Bruk en unik securekey parameter for hver webadresse
EnterRefToBuildUrl=Oppgi referanse for objektets %s EnterRefToBuildUrl=Oppgi referanse for objektets %s
GetSecuredUrl=Få beregnet URL GetSecuredUrl=Få beregnet URL
Module105Name=Mailman og Sip Module105Name=Mailman og SPIP
Module105Desc=Mailman eller Spip grensesnitt for medlem modulen Module105Desc=Mailman eller SPIP grensesnitt for medlem modulen
Module50000Name=PAYBOX Module50000Name=PAYBOX
Module50000Desc=Modul å tilby en online betaling side med kredittkort med PAYBOX Module50000Desc=Modul å tilby en online betaling side med kredittkort med PAYBOX
Module50200Name=Paypal Module50200Name=Paypal
@ -1309,6 +1308,6 @@ BankOrderGlobal=Generelt
BankOrderGlobalDesc=Generell visningsrekkefølgen BankOrderGlobalDesc=Generell visningsrekkefølgen
BankOrderES=Spansk BankOrderES=Spansk
BankOrderESDesc=Spansk visningsrekkefølgen BankOrderESDesc=Spansk visningsrekkefølgen
MailmanSpipSetup=Mailman og Spip modul Setup MailmanSpipSetup=Mailman og SPIP modul Setup
SuppliersInvoiceModel=Komplett mal av leverandør faktura (logo. ..) SuppliersInvoiceModel=Komplett mal av leverandør faktura (logo. ..)
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:08:28). // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:08:28).

1
htdocs/langs/nl_BE/admin.lang
View File

@ -496,7 +496,6 @@ Port=Port
VirtualServerName=Virtuele server naam VirtualServerName=Virtuele server naam
AllParameters=Alle parameters AllParameters=Alle parameters
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Modules PhpModules=Modules
PhpConf=Conf PhpConf=Conf

6
htdocs/langs/nl_NL/admin.lang
View File

@ -1320,8 +1320,8 @@ GetSecuredUrl=Get berekend URL
// Reference language: en_US -> nl_NL // Reference language: en_US -> nl_NL
WebUserGroup=Webserver gebruiker / groep WebUserGroup=Webserver gebruiker / groep
NoLockBeforeInsert=Geen lock-opdrachten rond INSERT NoLockBeforeInsert=Geen lock-opdrachten rond INSERT
Module105Name=Mailman en Sip Module105Name=Mailman en SPIP
Module105Desc=Mailman of Spip-interface voor leden-module Module105Desc=Mailman of SPIP-interface voor leden-module
Permission50001=Gebruik Verkooppunten Permission50001=Gebruik Verkooppunten
SecurityEventsPurged=Beveiliging gebeurtenissen verwijderd SecurityEventsPurged=Beveiliging gebeurtenissen verwijderd
ExtraFieldHasWrongValue=Toe te schrijven %s heeft een verkeerde waarde. ExtraFieldHasWrongValue=Toe te schrijven %s heeft een verkeerde waarde.
@ -1329,5 +1329,5 @@ SendmailOptionMayHurtBuggedMTA=Feature om e-mails met behulp van methode &quot;P
ServiceSetup=Services module setup ServiceSetup=Services module setup
ProductServiceSetup=Producten en Diensten modules setup ProductServiceSetup=Producten en Diensten modules setup
ViewProductDescInThirdpartyLanguageAbility=Visualisatie van producten die beschrijvingen in de thirdparty taal ViewProductDescInThirdpartyLanguageAbility=Visualisatie van producten die beschrijvingen in de thirdparty taal
MailmanSpipSetup=Mailman en Spip module Setup MailmanSpipSetup=Mailman en SPIP module Setup
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:12:32). // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:12:32).

1
htdocs/langs/pl_PL/admin.lang
View File

@ -504,7 +504,6 @@ Port=Port
VirtualServerName=Wirtualne nazwy serwera VirtualServerName=Wirtualne nazwy serwera
AllParameters=Wszystkie parametry AllParameters=Wszystkie parametry
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Moduły PhpModules=Moduły
PhpConf=Conf. PhpConf=Conf.

1
htdocs/langs/pt_BR/admin.lang
View File

@ -565,7 +565,6 @@ Port=Porta
VirtualServerName=Nome do servidor virtual VirtualServerName=Nome do servidor virtual
AllParameters=Todos os parâmetros AllParameters=Todos os parâmetros
OS=SO OS=SO
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Módulos PhpModules=Módulos
PhpConf=Conf PhpConf=Conf

7
htdocs/langs/pt_PT/admin.lang
View File

@ -545,7 +545,6 @@ Port=Porta
VirtualServerName=Nome do servidor virtual VirtualServerName=Nome do servidor virtual
AllParameters=Todos os parâmetros AllParameters=Todos os parâmetros
OS=SO OS=SO
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Módulos PhpModules=Módulos
PhpConf=Conf PhpConf=Conf
@ -1243,8 +1242,8 @@ UrlGenerationParameters=Parâmetros para garantir URLs
SecurityTokenIsUnique=Use um parâmetro securekey exclusivo para cada URL SecurityTokenIsUnique=Use um parâmetro securekey exclusivo para cada URL
EnterRefToBuildUrl=Digite referência para %s objeto EnterRefToBuildUrl=Digite referência para %s objeto
GetSecuredUrl=Obter URL calculado GetSecuredUrl=Obter URL calculado
Module105Name=Mailman e Sip Module105Name=Mailman e SPIP
Module105Desc=Mailman ou Spip interface para o módulo membro Module105Desc=Mailman ou SPIP interface para o módulo membro
Module50000Name=Paybox Module50000Name=Paybox
Module50000Desc=Módulo para oferecer uma página de pagamento online por cartão de crédito com paybox Module50000Desc=Módulo para oferecer uma página de pagamento online por cartão de crédito com paybox
Module50200Name=Paypal Module50200Name=Paypal
@ -1315,6 +1314,6 @@ BankOrderGlobal=Geral
BankOrderGlobalDesc=Ordem de exibição Geral BankOrderGlobalDesc=Ordem de exibição Geral
BankOrderES=Espanhol BankOrderES=Espanhol
BankOrderESDesc=Ordem de apresentação espanhol BankOrderESDesc=Ordem de apresentação espanhol
MailmanSpipSetup=Mailman e Spip instalação do módulo MailmanSpipSetup=Mailman e SPIP instalação do módulo
SuppliersInvoiceModel=Modelo completo da fatura do fornecedor (logo. ..) SuppliersInvoiceModel=Modelo completo da fatura do fornecedor (logo. ..)
// STOP - Lines generated via autotranslator.php tool (2012-02-29 15:47:43). // STOP - Lines generated via autotranslator.php tool (2012-02-29 15:47:43).

1
htdocs/langs/ro_RO/admin.lang
View File

@ -502,7 +502,6 @@ Port=Port
VirtualServerName=Virtual server de nume VirtualServerName=Virtual server de nume
AllParameters=Toţi parametrii AllParameters=Toţi parametrii
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Module PhpModules=Module
PhpConf=Conf. PhpConf=Conf.

1
htdocs/langs/ro_RO/install.lang
View File

@ -654,7 +654,6 @@ Port=Port
VirtualServerName=Wirtualne nazwy serwera VirtualServerName=Wirtualne nazwy serwera
AllParameters=Wszystkie parametry AllParameters=Wszystkie parametry
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Moduły PhpModules=Moduły
PhpConf=Conf. PhpConf=Conf.

1
htdocs/langs/ru_RU/admin.lang
View File

@ -501,7 +501,6 @@ Port=Порт
VirtualServerName=Виртуальный сервер Имя VirtualServerName=Виртуальный сервер Имя
AllParameters=Все параметры AllParameters=Все параметры
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Модули PhpModules=Модули
PhpConf=Conf PhpConf=Conf

6
htdocs/langs/sl_SI/admin.lang
View File

@ -1287,8 +1287,8 @@ UrlGenerationParameters=Parametri za zagotovitev URL
SecurityTokenIsUnique=Uporabite edinstven parameter securekey za vsako URL SecurityTokenIsUnique=Uporabite edinstven parameter securekey za vsako URL
EnterRefToBuildUrl=Vnesite sklic za predmet %s EnterRefToBuildUrl=Vnesite sklic za predmet %s
GetSecuredUrl=Get izračuna URL GetSecuredUrl=Get izračuna URL
Module105Name=Mailman in Sip Module105Name=Mailman in SPIP
Module105Desc=Mailman ali Spip vmesnik za modul člana Module105Desc=Mailman ali SPIP vmesnik za modul člana
SecurityEventsPurged=Varnostni dogodki očistimo SecurityEventsPurged=Varnostni dogodki očistimo
ExtraFieldHasWrongValue=Pripišejo %s ima napačno vrednost. ExtraFieldHasWrongValue=Pripišejo %s ima napačno vrednost.
SendmailOptionMayHurtBuggedMTA=Funkcija za pošiljanje pošte z uporabo metode &quot;PHP mail DIRECT&quot; bo ustvarila poštno sporočilo, ki ga ni mogoče pravilno razčleniti z nekaterimi, ki so prejemali poštnih strežnikov. Posledica tega je, da so nekatere pošte ne berejo ljudje, ki jih gosti thoose bugged platforme. To je veljalo za nekaj internetnih ponudnikov (npr.: Orange v Franciji). To ni problem v Dolibarr niti v PHP, ampak na prejemanje poštni strežnik. Lahko pa dodate možnost MAIN_FIX_FOR_BUGGED_MTA 1. v setup - drugo spremeniti Dolibarr, da bi se temu izognili. Vendar pa lahko pride do težav z drugimi strežniki, ki spoštujejo strogo standardni SMTP. Druga rešitev (priporočile) je uporaba metode &quot;SMTP socket knjižnice&quot;, ki nima slabosti. SendmailOptionMayHurtBuggedMTA=Funkcija za pošiljanje pošte z uporabo metode &quot;PHP mail DIRECT&quot; bo ustvarila poštno sporočilo, ki ga ni mogoče pravilno razčleniti z nekaterimi, ki so prejemali poštnih strežnikov. Posledica tega je, da so nekatere pošte ne berejo ljudje, ki jih gosti thoose bugged platforme. To je veljalo za nekaj internetnih ponudnikov (npr.: Orange v Franciji). To ni problem v Dolibarr niti v PHP, ampak na prejemanje poštni strežnik. Lahko pa dodate možnost MAIN_FIX_FOR_BUGGED_MTA 1. v setup - drugo spremeniti Dolibarr, da bi se temu izognili. Vendar pa lahko pride do težav z drugimi strežniki, ki spoštujejo strogo standardni SMTP. Druga rešitev (priporočile) je uporaba metode &quot;SMTP socket knjižnice&quot;, ki nima slabosti.
@ -1299,5 +1299,5 @@ ServiceSetup=Storitve modul nastavitev
ProductServiceSetup=Izdelki in storitve moduli za nastavitev ProductServiceSetup=Izdelki in storitve moduli za nastavitev
ViewProductDescInThirdpartyLanguageAbility=Vizualizacija Poimenovanja izdelkov v thirdparty jeziku ViewProductDescInThirdpartyLanguageAbility=Vizualizacija Poimenovanja izdelkov v thirdparty jeziku
AccountancyCode=Računovodstvo zakonik AccountancyCode=Računovodstvo zakonik
MailmanSpipSetup=Mailman in namestitveni modul Spip MailmanSpipSetup=Mailman in namestitveni modul SPIP
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:31:09). // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:31:09).

1
htdocs/langs/sv_SE/admin.lang
View File

@ -640,7 +640,6 @@ Port=Port
VirtualServerName=Virtuell server namn VirtualServerName=Virtuell server namn
AllParameters=Alla parametrar AllParameters=Alla parametrar
OS=OS OS=OS
Php=Php
PhpEnv=Env PhpEnv=Env
PhpModules=Moduler PhpModules=Moduler
PhpConf=Conf PhpConf=Conf

3
htdocs/langs/tr_TR/admin.lang
View File

@ -626,7 +626,6 @@ Port=Port
VirtualServerName=Sanal sunucu adı VirtualServerName=Sanal sunucu adı
AllParameters=Tüm parametreler AllParameters=Tüm parametreler
OS=İşletim Sistemi OS=İşletim Sistemi
Php=Php
PhpEnv=Ortam PhpEnv=Ortam
PhpModules=Modüller PhpModules=Modüller
PhpConf=Yapı PhpConf=Yapı
@ -1271,7 +1270,7 @@ ProjectsModelModule=Proje raporu belge modeli
Permission50001=Satış Noktası kullanın. Permission50001=Satış Noktası kullanın.
WebUserGroup=Web sunucusu kullanıcısı/grubu WebUserGroup=Web sunucusu kullanıcısı/grubu
NoLockBeforeInsert=ARAYAEKLE etrafında kilit komutu yok NoLockBeforeInsert=ARAYAEKLE etrafında kilit komutu yok
Module105Name=Postacı (Mailman) ve Spip Module105Name=Postacı (Mailman) ve SPIP
Module105Desc=Üye modülleri için Postacı (Mailman) ya da SPIP arayüzü Module105Desc=Üye modülleri için Postacı (Mailman) ya da SPIP arayüzü
SecurityEventsPurged=Güvenlik eylemleri temizlendi SecurityEventsPurged=Güvenlik eylemleri temizlendi
ExtraFieldHasWrongValue=Öznitelik %s yanlış bir değerdir. ExtraFieldHasWrongValue=Öznitelik %s yanlış bir değerdir.

1
htdocs/langs/zh_CN/admin.lang
View File

@ -631,7 +631,6 @@ Port=港口
VirtualServerName=虚拟服务器名称 VirtualServerName=虚拟服务器名称
AllParameters=所有参数 AllParameters=所有参数
OS=操作系统 OS=操作系统
Php=腓
PhpEnv=包膜 PhpEnv=包膜
PhpModules=模块 PhpModules=模块
PhpConf=机密档案 PhpConf=机密档案

30
htdocs/product/fiche.php
View File

@ -144,7 +144,7 @@ if (empty($reshook))
{ {
$error=0; $error=0;
if (GETPOST('libelle')) if (! GETPOST('libelle'))
{ {
$mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('Label')).'</div>'; $mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('Label')).'</div>';
$action = "create"; $action = "create";
@ -665,7 +665,10 @@ $helpurl='';
if (GETPOST("type") == '0') $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos'; if (GETPOST("type") == '0') $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
if (GETPOST("type") == '1') $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios'; if (GETPOST("type") == '1') $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
llxHeader('',$langs->trans("CardProduct".GETPOST("type")),$helpurl); if (isset($_GET['type'])) $title = $langs->trans('CardProduct'.GETPOST('type'));
else $title = $langs->trans('ProductServiceCard');
llxHeader('', $title, $helpurl);
$form = new Form($db); $form = new Form($db);
$formproduct = new FormProduct($db); $formproduct = new FormProduct($db);
@ -691,6 +694,9 @@ else
// ----------------------------------------- // -----------------------------------------
if ($action == 'create' && ($user->rights->produit->creer || $user->rights->service->creer)) if ($action == 'create' && ($user->rights->produit->creer || $user->rights->service->creer))
{ {
//WYSIWYG Editor
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
print '<form action="fiche.php" method="post">'; print '<form action="fiche.php" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
@ -741,8 +747,7 @@ else
// Description (used in invoice, propal...) // Description (used in invoice, propal...)
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>'; print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor = new DolEditor('desc', GETPOST('desc'), '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 90);
$doleditor=new DolEditor('desc',GETPOST('desc'),'',160,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,4,90);
$doleditor->Create(); $doleditor->Create();
print "</td></tr>"; print "</td></tr>";
@ -817,8 +822,8 @@ else
// Note (private, no output on invoices, propales...) // Note (private, no output on invoices, propales...)
print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>'; print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note',GETPOST('note'),'',180,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,8,70); $doleditor = new DolEditor('note', GETPOST('note'), '', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 8, 70);
$doleditor->Create(); $doleditor->Create();
print "</td></tr>"; print "</td></tr>";
@ -874,6 +879,9 @@ else
// Fiche en mode edition // Fiche en mode edition
if ($action == 'edit' && ($user->rights->produit->creer || $user->rights->service->creer)) if ($action == 'edit' && ($user->rights->produit->creer || $user->rights->service->creer))
{ {
//WYSIWYG Editor
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$type = $langs->trans('Product'); $type = $langs->trans('Product');
if ($object->isservice()) $type = $langs->trans('Service'); if ($object->isservice()) $type = $langs->trans('Service');
print_fiche_titre($langs->trans('Modify').' '.$type.' : '.$object->ref, ""); print_fiche_titre($langs->trans('Modify').' '.$type.' : '.$object->ref, "");
@ -928,9 +936,10 @@ else
// Description (used in invoice, propal...) // Description (used in invoice, propal...)
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="2">'; print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="2">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('desc',$object->description,'',160,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,4,90); $doleditor = new DolEditor('desc', $object->description, '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 90);
$doleditor->Create(); $doleditor->Create();
print "</td></tr>"; print "</td></tr>";
print "\n"; print "\n";
@ -1020,9 +1029,10 @@ else
// Note // Note
print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="2">'; print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="2">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note',$object->note,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,8,70); $doleditor = new DolEditor('note', $object->note, '', 200, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 8, 70);
$doleditor->Create(); $doleditor->Create();
print "</td></tr>"; print "</td></tr>";
print '</table>'; print '</table>';

2
htdocs/product/index.php
View File

@ -48,7 +48,7 @@ $transAreaType = $langs->trans("ProductsAndServicesArea");
$helpurl=''; $helpurl='';
if (! isset($_GET["type"])) if (! isset($_GET["type"]))
{ {
$transAreaType = $langs->trans("ProductsArea"); $transAreaType = $langs->trans("ProductsAndServicesArea");
$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos'; $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
} }
if ((isset($_GET["type"]) && $_GET["type"] == 0) || empty($conf->service->enabled)) if ((isset($_GET["type"]) && $_GET["type"] == 0) || empty($conf->service->enabled))

26
htdocs/product/traduction.php
View File

@ -160,6 +160,9 @@ print '</table>';
if ($action == 'edit') if ($action == 'edit')
{ {
//WYSIWYG Editor
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
print '<form action="" method="POST">'; print '<form action="" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="vedit">'; print '<input type="hidden" name="action" value="vedit">';
@ -173,14 +176,16 @@ if ($action == 'edit')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td valign="top" width="15%" class="fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" size="40" value="'.$product->multilangs[$key]["libelle"].'"></td></tr>'; print '<tr><td valign="top" width="15%" class="fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" size="40" value="'.$product->multilangs[$key]["libelle"].'"></td></tr>';
print '<tr><td valign="top" width="15%">'.$langs->trans('Description').'</td><td>'; print '<tr><td valign="top" width="15%">'.$langs->trans('Description').'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('desc-'.$key.'',$product->multilangs[$key]["description"],'',160,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,3,80); $doleditor = new DolEditor("desc-$key", $product->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 3, 80);
$doleditor->Create(); $doleditor->Create();
print '</td></tr>'; print '</td></tr>';
print '<tr><td valign="top" width="15%">'.$langs->trans('Note').'</td><td>'; print '<tr><td valign="top" width="15%">'.$langs->trans('Note').'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note-'.$key.'',$product->multilangs[$key]["note"],'',160,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,3,80); $doleditor = new DolEditor("note-$key", $product->multilangs[$key]["note"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 3, 80);
$doleditor->Create(); $doleditor->Create();
print '</td></tr>'; print '</td></tr>';
print '</tr>'; print '</tr>';
print '</table>'; print '</table>';
@ -241,6 +246,9 @@ print "\n</div>\n";
if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service->creer)) if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service->creer))
{ {
//WYSIWYG Editor
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
print '<br>'; print '<br>';
print '<form action="" method="post">'; print '<form action="" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -253,14 +261,16 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
print '</td></tr>'; print '</td></tr>';
print '<tr><td valign="top" width="15%" class="fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle" size="40"></td></tr>'; print '<tr><td valign="top" width="15%" class="fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle" size="40"></td></tr>';
print '<tr><td valign="top" width="15%">'.$langs->trans('Description').'</td><td>'; print '<tr><td valign="top" width="15%">'.$langs->trans('Description').'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('desc','','',160,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,3,80); $doleditor = new DolEditor('desc', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 3, 80);
$doleditor->Create(); $doleditor->Create();
print '</td></tr>'; print '</td></tr>';
print '<tr><td valign="top" width="15%">'.$langs->trans('Note').'</td><td>'; print '<tr><td valign="top" width="15%">'.$langs->trans('Note').'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note','','',160,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,3,80); $doleditor = new DolEditor('note', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 3, 80);
$doleditor->Create(); $doleditor->Create();
print '</td></tr>'; print '</td></tr>';
print '</tr>'; print '</tr>';
print '</table>'; print '</table>';

225
htdocs/societe/soc.php
View File

@ -58,6 +58,7 @@ $extrafields = new ExtraFields($db);
// Get object canvas (By default, this is not defined, so standard usage of dolibarr) // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
$object->getCanvas($socid); $object->getCanvas($socid);
$canvas = $object->canvas?$object->canvas:GETPOST("canvas"); $canvas = $object->canvas?$object->canvas:GETPOST("canvas");
$objcanvas='';
if (! empty($canvas)) if (! empty($canvas))
{ {
require_once(DOL_DOCUMENT_ROOT."/core/class/canvas.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/canvas.class.php");
@ -113,67 +114,67 @@ if (empty($reshook))
{ {
$object->particulier = GETPOST("private"); $object->particulier = GETPOST("private");
$object->name = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?trim($_POST["prenom"].' '.$_POST["nom"]):trim($_POST["nom"].' '.$_POST["prenom"]); $object->name = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?GETPOST('prenom').' '.GETPOST('nom'):GETPOST('nom').' '.GETPOST('prenom');
$object->civilite_id = $_POST["civilite_id"]; $object->civilite_id = GETPOST('civilite_id');
// Add non official properties // Add non official properties
$object->name_bis = $_POST["nom"]; $object->name_bis = GETPOST('nom');
$object->firstname = $_POST["prenom"]; $object->firstname = GETPOST('prenom');
} }
else else
{ {
$object->name = $_POST["nom"]; $object->name = GETPOST('nom');
} }
$object->address = $_POST["adresse"]; $object->address = GETPOST('adresse');
$object->zip = $_POST["zipcode"]; $object->zip = GETPOST('zipcode');
$object->town = $_POST["town"]; $object->town = GETPOST('town');
$object->country_id = $_POST["country_id"]; $object->country_id = GETPOST('country_id');
$object->state_id = $_POST["departement_id"]; $object->state_id = GETPOST('departement_id');
$object->tel = $_POST["tel"]; $object->tel = GETPOST('tel');
$object->fax = $_POST["fax"]; $object->fax = GETPOST('fax');
$object->email = trim($_POST["email"]); $object->email = GETPOST('email');
$object->url = trim($_POST["url"]); $object->url = GETPOST('url');
$object->idprof1 = $_POST["idprof1"]; $object->idprof1 = GETPOST('idprof1');
$object->idprof2 = $_POST["idprof2"]; $object->idprof2 = GETPOST('idprof2');
$object->idprof3 = $_POST["idprof3"]; $object->idprof3 = GETPOST('idprof3');
$object->idprof4 = $_POST["idprof4"]; $object->idprof4 = GETPOST('idprof4');
$object->prefix_comm = $_POST["prefix_comm"]; $object->prefix_comm = GETPOST('prefix_comm');
$object->code_client = $_POST["code_client"]; $object->code_client = GETPOST('code_client');
$object->code_fournisseur = $_POST["code_fournisseur"]; $object->code_fournisseur = GETPOST('code_fournisseur');
$object->capital = $_POST["capital"]; $object->capital = GETPOST('capital');
$object->barcode = $_POST["barcode"]; $object->barcode = GETPOST('barcode');
$object->tva_intra = $_POST["tva_intra"]; $object->tva_intra = GETPOST('tva_intra');
$object->tva_assuj = $_POST["assujtva_value"]; $object->tva_assuj = GETPOST('assujtva_value');
$object->status = $_POST["status"]; $object->status = GETPOST('status');
// Local Taxes // Local Taxes
$object->localtax1_assuj = $_POST["localtax1assuj_value"]; $object->localtax1_assuj = GETPOST('localtax1assuj_value');
$object->localtax2_assuj = $_POST["localtax2assuj_value"]; $object->localtax2_assuj = GETPOST('localtax2assuj_value');
$object->forme_juridique_code = $_POST["forme_juridique_code"]; $object->forme_juridique_code = GETPOST('forme_juridique_code');
$object->effectif_id = $_POST["effectif_id"]; $object->effectif_id = GETPOST('effectif_id');
if (GETPOST("private") == 1) if (GETPOST("private") == 1)
{ {
$object->typent_id = 8; // TODO predict another method if the field "special" change of rowid $object->typent_id = 8; // TODO predict another method if the field "special" change of rowid
} }
else else
{ {
$object->typent_id = $_POST["typent_id"]; $object->typent_id = GETPOST('typent_id');
} }
$object->client = $_POST["client"]; $object->client = GETPOST('client');
$object->fournisseur = $_POST["fournisseur"]; $object->fournisseur = GETPOST('fournisseur');
$object->fournisseur_categorie = $_POST["fournisseur_categorie"]; $object->fournisseur_categorie = GETPOST('fournisseur_categorie');
$object->commercial_id = $_POST["commercial_id"]; $object->commercial_id = GETPOST('commercial_id');
$object->default_lang = $_POST["default_lang"]; $object->default_lang = GETPOST('default_lang');
// Get extra fields // Get extra fields
foreach($_POST as $key => $value) foreach($_POST as $key => $value)
{ {
if (preg_match("/^options_/",$key)) if (preg_match("/^options_/",$key))
{ {
$object->array_options[$key]=$_POST[$key]; $object->array_options[$key]=GETPOST($key);
} }
} }
@ -546,49 +547,49 @@ else
if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; } if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; }
if (GETPOST("private")==1) { $object->particulier=1; } if (GETPOST("private")==1) { $object->particulier=1; }
$object->name = $_POST["nom"]; $object->name = GETPOST('nom');
$object->firstname = $_POST["prenom"]; $object->firstname = GETPOST('prenom');
$object->particulier = GETPOST('private', 'int'); $object->particulier = GETPOST('private', 'int');
$object->prefix_comm = $_POST["prefix_comm"]; $object->prefix_comm = GETPOST('prefix_comm');
$object->client = $_POST["client"]?$_POST["client"]:$object->client; $object->client = GETPOST('client')?GETPOST('client'):$object->client;
$object->code_client = $_POST["code_client"]; $object->code_client = GETPOST('code_client');
$object->fournisseur = $_POST["fournisseur"]?$_POST["fournisseur"]:$object->fournisseur; $object->fournisseur = GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
$object->code_fournisseur = $_POST["code_fournisseur"]; $object->code_fournisseur = GETPOST('code_fournisseur');
$object->address = $_POST["adresse"]; $object->address = GETPOST('adresse');
$object->zip = $_POST["zipcode"]; $object->zip = GETPOST('zipcode');
$object->town = $_POST["town"]; $object->town = GETPOST('town');
$object->state_id = $_POST["departement_id"]; $object->state_id = GETPOST('departement_id');
$object->tel = $_POST["tel"]; $object->tel = GETPOST('tel');
$object->fax = $_POST["fax"]; $object->fax = GETPOST('fax');
$object->email = $_POST["email"]; $object->email = GETPOST('email');
$object->url = $_POST["url"]; $object->url = GETPOST('url');
$object->capital = $_POST["capital"]; $object->capital = GETPOST('capital');
$object->barcode = $_POST["barcode"]; $object->barcode = GETPOST('barcode');
$object->idprof1 = $_POST["idprof1"]; $object->idprof1 = GETPOST('idprof1');
$object->idprof2 = $_POST["idprof2"]; $object->idprof2 = GETPOST('idprof2');
$object->idprof3 = $_POST["idprof3"]; $object->idprof3 = GETPOST('idprof3');
$object->idprof4 = $_POST["idprof4"]; $object->idprof4 = GETPOST('idprof4');
$object->typent_id = $_POST["typent_id"]; $object->typent_id = GETPOST('typent_id');
$object->effectif_id = $_POST["effectif_id"]; $object->effectif_id = GETPOST('effectif_id');
$object->civility_id = $_POST["civilite_id"]; $object->civility_id = GETPOST('civilite_id');
$object->tva_assuj = $_POST["assujtva_value"]; $object->tva_assuj = GETPOST('assujtva_value');
$object->status = $_POST["status"]; $object->status = GETPOST('status');
//Local Taxes //Local Taxes
$object->localtax1_assuj = $_POST["localtax1assuj_value"]; $object->localtax1_assuj = GETPOST('localtax1assuj_value');
$object->localtax2_assuj = $_POST["localtax2assuj_value"]; $object->localtax2_assuj = GETPOST('localtax2assuj_value');
$object->tva_intra = $_POST["tva_intra"]; $object->tva_intra = GETPOST('tva_intra');
$object->commercial_id = $_POST["commercial_id"]; $object->commercial_id = GETPOST('commercial_id');
$object->default_lang = $_POST["default_lang"]; $object->default_lang = GETPOST('default_lang');
$object->logo = dol_sanitizeFileName($_FILES['photo']['name']); $object->logo = (isset($_FILES['photo'])?dol_sanitizeFileName($_FILES['photo']['name']):'');
// Gestion du logo de la société // Gestion du logo de la société
$dir = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos"; $dir = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']); $file_OK = (isset($_FILES['photo'])?is_uploaded_file($_FILES['photo']['tmp_name']):false);
if ($file_OK) if ($file_OK)
{ {
if (image_format_supported($_FILES['photo']['name'])) if (image_format_supported($_FILES['photo']['name']))
@ -619,19 +620,19 @@ else
} }
// We set country_id, country_code and country for the selected country // We set country_id, country_code and country for the selected country
$object->country_id=$_POST["country_id"]?$_POST["country_id"]:$mysoc->country_id; $object->country_id=GETPOST('country_id')?GETPOST('country_id'):$mysoc->country_id;
if ($object->country_id) if ($object->country_id)
{ {
$tmparray=getCountry($object->country_id,'all'); $tmparray=getCountry($object->country_id,'all');
$object->country_code=$tmparray['code']; $object->country_code=$tmparray['code'];
$object->country=$tmparray['label']; $object->country=$tmparray['label'];
} }
$object->forme_juridique_code=$_POST['forme_juridique_code']; $object->forme_juridique_code=GETPOST('forme_juridique_code');
/* Show create form */ /* Show create form */
print_fiche_titre($langs->trans("NewThirdParty")); print_fiche_titre($langs->trans("NewThirdParty"));
if ($conf->use_javascript_ajax) if (! empty($conf->use_javascript_ajax))
{ {
print "\n".'<script type="text/javascript">'; print "\n".'<script type="text/javascript">';
print '$(document).ready(function () { print '$(document).ready(function () {
@ -741,7 +742,7 @@ else
print '</td></tr>'; print '</td></tr>';
if ($conf->fournisseur->enabled && ! empty($user->rights->fournisseur->lire)) if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
{ {
// Supplier // Supplier
print '<tr>'; print '<tr>';
@ -770,7 +771,7 @@ else
{ {
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">'; print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">';
print $form->selectarray("fournisseur_categorie",$object->SupplierCategories,$_POST["fournisseur_categorie"],1); print $form->selectarray("fournisseur_categorie",$object->SupplierCategories,GETPOST('fournisseur_categorie'),1);
print '</td></tr>'; print '</td></tr>';
} }
} }
@ -783,7 +784,7 @@ else
print '</td></tr>'; print '</td></tr>';
// Barcode // Barcode
if ($conf->global->MAIN_MODULE_BARCODE) if (! empty($conf->global->MAIN_MODULE_BARCODE))
{ {
print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="barcode" value="'.$object->barcode.'">'; print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="barcode" value="'.$object->barcode.'">';
print '</td></tr>'; print '</td></tr>';
@ -820,7 +821,7 @@ else
print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="tel" value="'.$object->tel.'"></td>'; print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="tel" value="'.$object->tel.'"></td>';
print '<td>'.$langs->trans('Fax').'</td><td><input type="text" name="fax" value="'.$object->fax.'"></td></tr>'; print '<td>'.$langs->trans('Fax').'</td><td><input type="text" name="fax" value="'.$object->fax.'"></td></tr>';
print '<tr><td>'.$langs->trans('EMail').($conf->global->SOCIETE_MAIL_REQUIRED?'*':'').'</td><td><input type="text" name="email" size="32" value="'.$object->email.'"></td>'; print '<tr><td>'.$langs->trans('EMail').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').'</td><td><input type="text" name="email" size="32" value="'.$object->email.'"></td>';
print '<td>'.$langs->trans('Web').'</td><td><input type="text" name="url" size="32" value="'.$object->url.'"></td></tr>'; print '<td>'.$langs->trans('Web').'</td><td><input type="text" name="url" size="32" value="'.$object->url.'"></td></tr>';
// Prof ids // Prof ids
@ -856,7 +857,7 @@ else
{ {
$s.=' '; $s.=' ';
if ($conf->use_javascript_ajax) if (! empty($conf->use_javascript_ajax))
{ {
print "\n"; print "\n";
print '<script language="JavaScript" type="text/javascript">'; print '<script language="JavaScript" type="text/javascript">';
@ -930,7 +931,7 @@ else
} }
} }
if ($conf->global->MAIN_MULTILANGS) if (! empty($conf->global->MAIN_MULTILANGS))
{ {
print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n"; print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n";
print $formadmin->select_language(($object->default_lang?$object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1); print $formadmin->select_language(($object->default_lang?$object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1);
@ -955,7 +956,7 @@ else
{ {
foreach($extrafields->attribute_label as $key=>$label) foreach($extrafields->attribute_label as $key=>$label)
{ {
$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]); $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options["options_".$key])?$object->array_options["options_".$key]:''));
print '<tr><td>'.$label.'</td><td colspan="3">'; print '<tr><td>'.$label.'</td><td colspan="3">';
print $extrafields->showInputField($key,$value); print $extrafields->showInputField($key,$value);
print '</td></tr>'."\n"; print '</td></tr>'."\n";
@ -1038,42 +1039,42 @@ else
$prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed(); $prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
} }
if (! empty($_POST["nom"])) if (GETPOST('nom'))
{ {
// We overwrite with values if posted // We overwrite with values if posted
$object->name = $_POST["nom"]; $object->name = GETPOST('nom');
$object->prefix_comm = $_POST["prefix_comm"]; $object->prefix_comm = GETPOST('prefix_comm');
$object->client = $_POST["client"]; $object->client = GETPOST('client');
$object->code_client = $_POST["code_client"]; $object->code_client = GETPOST('code_client');
$object->fournisseur = $_POST["fournisseur"]; $object->fournisseur = GETPOST('fournisseur');
$object->code_fournisseur = $_POST["code_fournisseur"]; $object->code_fournisseur = GETPOST('code_fournisseur');
$object->address = $_POST["adresse"]; $object->address = GETPOST('adresse');
$object->zip = $_POST["zipcode"]; $object->zip = GETPOST('zipcode');
$object->town = $_POST["town"]; $object->town = GETPOST('town');
$object->country_id = $_POST["country_id"]?$_POST["country_id"]:$mysoc->country_id; $object->country_id = GETPOST('country_id')?GETPOST('country_id'):$mysoc->country_id;
$object->state_id = $_POST["departement_id"]; $object->state_id = GETPOST('departement_id');
$object->tel = $_POST["tel"]; $object->tel = GETPOST('tel');
$object->fax = $_POST["fax"]; $object->fax = GETPOST('fax');
$object->email = $_POST["email"]; $object->email = GETPOST('email');
$object->url = $_POST["url"]; $object->url = GETPOST('url');
$object->capital = $_POST["capital"]; $object->capital = GETPOST('capital');
$object->idprof1 = $_POST["idprof1"]; $object->idprof1 = GETPOST('idprof1');
$object->idprof2 = $_POST["idprof2"]; $object->idprof2 = GETPOST('idprof2');
$object->idprof3 = $_POST["idprof3"]; $object->idprof3 = GETPOST('idprof3');
$object->idprof4 = $_POST["idprof4"]; $object->idprof4 = GETPOST('idprof4');
$object->typent_id = $_POST["typent_id"]; $object->typent_id = GETPOST('typent_id');
$object->effectif_id = $_POST["effectif_id"]; $object->effectif_id = GETPOST('effectif_id');
$object->barcode = $_POST["barcode"]; $object->barcode = GETPOST('barcode');
$object->forme_juridique_code = $_POST["forme_juridique_code"]; $object->forme_juridique_code = GETPOST('forme_juridique_code');
$object->default_lang = $_POST["default_lang"]; $object->default_lang = GETPOST('default_lang');
$object->tva_assuj = $_POST["assujtva_value"]; $object->tva_assuj = GETPOST('assujtva_value');
$object->tva_intra = $_POST["tva_intra"]; $object->tva_intra = GETPOST('tva_intra');
$object->status = $_POST["status"]; $object->status = GETPOST('status');
//Local Taxes //Local Taxes
$object->localtax1_assuj = $_POST["localtax1assuj_value"]; $object->localtax1_assuj = GETPOST('localtax1assuj_value');
$object->localtax2_assuj = $_POST["localtax2assuj_value"]; $object->localtax2_assuj = GETPOST('localtax2assuj_value');
// We set country_id, and pays_code label of the chosen country // We set country_id, and pays_code label of the chosen country
// TODO move to DAO class // TODO move to DAO class

23
htdocs/user/param_ihm.php
View File

@ -41,7 +41,7 @@ $action = GETPOST('action','alpha');
if ($id) if ($id)
{ {
// $user est le user qui edite, $id est l'id de l'utilisateur edite // $user est le user qui edite, $id est l'id de l'utilisateur edite
$caneditfield=( (($user->id == $id) && $user->rights->user->self->creer) $caneditfield=((($user->id == $id) && $user->rights->user->self->creer)
|| (($user->id != $id) && $user->rights->user->user->creer)); || (($user->id != $id) && $user->rights->user->user->creer));
} }
@ -145,7 +145,19 @@ print '</table><br>';
if ($action == 'edit') if ($action == 'edit')
{ {
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">'; print '<script type="text/javascript" language="javascript">
jQuery(document).ready(function() {
$("#main_lang_default").change(function() {
$("#check_MAIN_LANG_DEFAULT").attr(\'checked\', true);
});
$("#main_size_liste_limit").keyup(function() {
if ($(this).val().length) $("#check_SIZE_LISTE_LIMIT").attr(\'checked\', true);
else $("#check_SIZE_LISTE_LIMIT").attr(\'checked\', false);
});
});
</script>';
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="id" value="'.$id.'">'; print '<input type="hidden" name="id" value="'.$id.'">';
@ -164,7 +176,7 @@ if ($action == 'edit')
print $s?$s.' ':''; print $s?$s.' ':'';
print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)); print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
print '</td>'; print '</td>';
print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_LANG_DEFAULT" type="checkbox" '.(! empty($fuser->conf->MAIN_LANG_DEFAULT)?" checked":""); print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_LANG_DEFAULT" id="check_MAIN_LANG_DEFAULT" type="checkbox" '.(! empty($fuser->conf->MAIN_LANG_DEFAULT)?" checked":"");
print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo
print '> '.$langs->trans("UsePersonalValue").'</td>'; print '> '.$langs->trans("UsePersonalValue").'</td>';
print '<td>'; print '<td>';
@ -175,10 +187,10 @@ if ($action == 'edit')
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>';
print '<td>'.$conf->global->MAIN_SIZE_LISTE_LIMIT.'</td>'; print '<td>'.$conf->global->MAIN_SIZE_LISTE_LIMIT.'</td>';
print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' name="check_SIZE_LISTE_LIMIT" type="checkbox" '.(! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":""); print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' name="check_SIZE_LISTE_LIMIT" id="check_SIZE_LISTE_LIMIT" type="checkbox" '.(! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"");
print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo
print '> '.$langs->trans("UsePersonalValue").'</td>'; print '> '.$langs->trans("UsePersonalValue").'</td>';
print '<td><input class="flat" name="main_size_liste_limit" size="4" value="' . (! empty($fuser->conf->SIZE_LISTE_LIMIT)?$fuser->conf->SIZE_LISTE_LIMIT:'') . '"></td></tr>'; print '<td><input class="flat" name="main_size_liste_limit" id="main_size_liste_limit" size="4" value="' . (! empty($fuser->conf->SIZE_LISTE_LIMIT)?$fuser->conf->SIZE_LISTE_LIMIT:'') . '"></td></tr>';
print '</table><br>'; print '</table><br>';
@ -251,6 +263,7 @@ else
} }
dol_fiche_end();
llxFooter(); llxFooter();
$db->close(); $db->close();

18
htdocs/user/perms.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org> * Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* *
@ -66,6 +66,7 @@ if ($user->id <> $id && ! $canreaduser) accessforbidden();
/** /**
* Actions * Actions
*/ */
if ($action == 'addrights' && $caneditperms) if ($action == 'addrights' && $caneditperms)
{ {
$edituser = new User($db); $edituser = new User($db);
@ -96,11 +97,9 @@ if ($action == 'delrights' && $caneditperms)
/* ************************************************************************** */ /**
/* */ * View
/* Visu et edition */ */
/* */
/* ************************************************************************** */
llxHeader('',$langs->trans("Permissions")); llxHeader('',$langs->trans("Permissions"));
@ -110,9 +109,6 @@ $fuser = new User($db);
$fuser->fetch($id); $fuser->fetch($id);
$fuser->getrights(); $fuser->getrights();
/*
* Affichage onglets
*/
$head = user_prepare_head($fuser); $head = user_prepare_head($fuser);
$title = $langs->trans("User"); $title = $langs->trans("User");
@ -321,7 +317,7 @@ if ($result)
print '</td>'; print '</td>';
// Permission and tick // Permission and tick
if ($fuser->admin && $objMod->rights_admin_allowed) // Permission own because admin if (! empty($fuser->admin) && ! empty($objMod->rights_admin_allowed)) // Permission own because admin
{ {
if ($caneditperms) if ($caneditperms)
{ {
@ -376,6 +372,8 @@ else dol_print_error($db);
print '</table>'; print '</table>';
dol_fiche_end();
llxFooter(); llxFooter();
$db->close(); $db->close();