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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-07-11 15:44:25 +02:00
commit 14917190b9
82 changed files with 1049 additions and 1050 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev/iso-normes/address_format.txt Executable file
View File

@ -0,0 +1 @@
http://bitboost.com/ref/international-address-formats.html#Formats

26
htdocs/admin/const.php
View File

@ -30,10 +30,16 @@ $langs->load("admin");
if (! $user->admin) accessforbidden(); if (! $user->admin) accessforbidden();
$action = GETPOST('action'); $rowid=GETPOST('rowid','int');
$debug = GETPOST('debug'); $entity=GETPOST('entity','int');
$action=GETPOST('action');
$update=GETPOST('update');
$delete=GETPOST('delete');
$debug=GETPOST('debug');
$consts=GETPOST('const');
$typeconst=array('yesno','texte','chaine'); $typeconst=array('yesno','texte','chaine');
$mesg='';
/* /*
@ -64,11 +70,11 @@ if ($action == 'add')
} }
} }
if (($_POST["const"] && isset($_POST["update"]) && $_POST["update"] == $langs->trans("Modify"))) if (! empty($consts) && $update == $langs->trans("Modify"))
{ {
foreach($_POST["const"] as $const) foreach($consts as $const)
{ {
if ($const["check"]) if (! empty($const["check"]))
{ {
if (dolibarr_set_const($db, $const["name"],$const["value"],$const["type"],1,$const["note"],$const["entity"]) < 0) if (dolibarr_set_const($db, $const["name"],$const["value"],$const["type"],1,$const["note"],$const["entity"]) < 0)
{ {
@ -79,11 +85,11 @@ if (($_POST["const"] && isset($_POST["update"]) && $_POST["update"] == $langs->t
} }
// Delete several lines at once // Delete several lines at once
if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("Delete")) if (! empty($consts) && $delete == $langs->trans("Delete"))
{ {
foreach($_POST["const"] as $const) foreach($consts as $const)
{ {
if ($const["check"]) // Is checkbox checked if (! empty($const["check"])) // Is checkbox checked
{ {
if (dolibarr_del_const($db, $const["rowid"], -1) < 0) if (dolibarr_del_const($db, $const["rowid"], -1) < 0)
{ {
@ -96,7 +102,7 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
// Delete line from delete picto // Delete line from delete picto
if ($action == 'delete') if ($action == 'delete')
{ {
if (dolibarr_del_const($db, $_GET["rowid"], $_GET["entity"]) < 0) if (dolibarr_del_const($db, $rowid, $entity) < 0)
{ {
dol_print_error($db); dol_print_error($db);
} }
@ -136,7 +142,7 @@ print_fiche_titre($langs->trans("OtherSetup"),'','setup');
print $langs->trans("ConstDesc")."<br>\n"; print $langs->trans("ConstDesc")."<br>\n";
print "<br>\n"; print "<br>\n";
if ($mesg) print $mesg; dol_htmloutput_mesg($mesg);
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';

312
htdocs/admin/delais.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 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) 2005 Simon Tosser <simon@kornog-computing.com> * Copyright (C) 2005 Simon Tosser <simon@kornog-computing.com>
* Copyright (C) 2005-2009 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
@ -27,31 +27,93 @@ require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("orders");
$langs->load("propal");
$langs->load("contracts");
$langs->load("bills");
$langs->load("banks");
if (! $user->admin) accessforbidden(); if (! $user->admin) accessforbidden();
$action=GETPOST('action','alpha'); $action=GETPOST('action','alpha');
$modules=array(
'agenda' => array(
array(
'code' => 'MAIN_DELAY_ACTIONS_TODO',
'img' => 'action'
)
),
'propal' => array(
array(
'code' => 'MAIN_DELAY_PROPALS_TO_CLOSE',
'img' => 'propal'
),
array(
'code' => 'MAIN_DELAY_PROPALS_TO_BILL',
'img' => 'propal'
)
),
'commande' => array(
array(
'code' => 'MAIN_DELAY_ORDERS_TO_PROCESS',
'img' => 'order'
)
),
'facture' => array(
array(
'code' => 'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',
'img' => 'bill'
)
),
'fournisseur' => array(
array(
'code' => 'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',
'img' => 'order'
),
array(
'code' => 'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',
'img' => 'bill'
)
),
'service' => array(
array(
'code' => 'MAIN_DELAY_NOT_ACTIVATED_SERVICES',
'img' => 'service'
),
array(
'code' => 'MAIN_DELAY_RUNNING_SERVICES',
'img' => 'service'
)
),
'banque' => array(
array(
'code' => 'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',
'img' => 'account'
),
array(
'code' => 'MAIN_DELAY_CHEQUES_TO_DEPOSIT',
'img' => 'account'
)
),
'adherent' => array(
array(
'code' => 'MAIN_DELAY_MEMBERS',
'img' => 'user'
)
),
);
if ($action == 'update') if ($action == 'update')
{ {
//Conversion des jours en secondes foreach($modules as $module => $delays)
if ($_POST["ActionsToDo"]) dolibarr_set_const($db, "MAIN_DELAY_ACTIONS_TODO",$_POST["ActionsToDo"],'chaine',0,'',$conf->entity); {
if ($_POST["OrdersToProcess"]) dolibarr_set_const($db, "MAIN_DELAY_ORDERS_TO_PROCESS",$_POST["OrdersToProcess"],'chaine',0,'',$conf->entity); if (! empty($conf->$module->enabled))
if ($_POST["SuppliersOrdersToProcess"]) dolibarr_set_const($db, "MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS",$_POST["SuppliersOrdersToProcess"],'chaine',0,'',$conf->entity); {
if ($_POST["PropalsToClose"]) dolibarr_set_const($db, "MAIN_DELAY_PROPALS_TO_CLOSE",$_POST["PropalsToClose"],'chaine',0,'',$conf->entity); foreach($delays as $delay)
if ($_POST["PropalsToBill"]) dolibarr_set_const($db, "MAIN_DELAY_PROPALS_TO_BILL",$_POST["PropalsToBill"],'chaine',0,'',$conf->entity); {
if ($_POST["BoardNotActivatedServices"]) dolibarr_set_const($db, "MAIN_DELAY_NOT_ACTIVATED_SERVICES",$_POST["BoardNotActivatedServices"],'chaine',0,'',$conf->entity); if (GETPOST($delay['code']))
if ($_POST["BoardRunningServices"]) dolibarr_set_const($db, "MAIN_DELAY_RUNNING_SERVICES",$_POST["BoardRunningServices"],'chaine',0,'',$conf->entity); {
if ($_POST["CustomerBillsUnpaid"]) dolibarr_set_const($db, "MAIN_DELAY_CUSTOMER_BILLS_UNPAYED",$_POST["CustomerBillsUnpaid"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
if ($_POST["SupplierBillsToPay"]) dolibarr_set_const($db, "MAIN_DELAY_SUPPLIER_BILLS_TO_PAY",$_POST["SupplierBillsToPay"],'chaine',0,'',$conf->entity); }
if ($_POST["TransactionsToConciliate"]) dolibarr_set_const($db, "MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE",$_POST["TransactionsToConciliate"],'chaine',0,'',$conf->entity); }
if ($_POST["ChequesToDeposit"]) dolibarr_set_const($db, "MAIN_DELAY_CHEQUES_TO_DEPOSIT",$_POST["ChequesToDeposit"],'chaine',0,'',$conf->entity); }
if ($_POST["Members"]) dolibarr_set_const($db, "MAIN_DELAY_MEMBERS",$_POST["Members"],'chaine',0,'',$conf->entity); }
dolibarr_set_const($db, "MAIN_DISABLE_METEO",$_POST["MAIN_DISABLE_METEO"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_DISABLE_METEO",$_POST["MAIN_DISABLE_METEO"],'chaine',0,'',$conf->entity);
} }
@ -72,10 +134,9 @@ print "<br>\n";
$form = new Form($db); $form = new Form($db);
$countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>'; $countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
if ($action == 'edit') if ($action == 'edit')
{ {
print '<form method="post" action="delais.php" name="form_index">'; print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="form_index">';
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">';
$var=true; $var=true;
@ -83,99 +144,20 @@ if ($action == 'edit')
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td width="120px">'.$langs->trans("Value").'</td></tr>'; print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td width="120px">'.$langs->trans("Value").'</td></tr>';
// foreach($modules as $module => $delays)
if (! empty($conf->agenda->enabled))
{ {
$var=!$var; if (! empty($conf->$module->enabled))
print '<tr '.$bc[$var].'>'; {
print '<td width="20px">'.img_object('','action').'</td>'; foreach($delays as $delay)
print '<td>'.$langs->trans("DelaysOfToleranceActionsToDo").'</td><td>'; {
print '<input size="5" name="ActionsToDo" value="'. ($conf->global->MAIN_DELAY_ACTIONS_TODO+0) . '"> ' . $langs->trans("days") . '</td></tr>'; $var=!$var;
} $value=(! empty($conf->global->$delay['code'])?$conf->global->$delay['code']:0);
if (! empty($conf->commande->enabled)) print '<tr '.$bc[$var].'>';
{ print '<td width="20px">'.img_object('',$delay['img']).'</td>';
$var=!$var; print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td>';
print '<tr '.$bc[$var].'>'; print '<input size="5" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
print '<td width="20px">'.img_object('','order').'</td>'; }
print '<td>'.$langs->trans("DelaysOfToleranceOrdersToProcess").'</td><td>'; }
print '<input size="5" name="OrdersToProcess" value="'. ($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->fournisseur->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','order').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceSuppliersOrdersToProcess").'</td><td>';
print '<input size="5" name="SuppliersOrdersToProcess" value="'. ($conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->propal->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','propal').'</td>';
print '<td>'.$langs->trans("DelaysOfTolerancePropalsToClose").'</td><td>';
print '<input size="5" name="PropalsToClose" value="'. ($conf->global->MAIN_DELAY_PROPALS_TO_CLOSE+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->propal->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','propal').'</td>';
print '<td>'.$langs->trans("DelaysOfTolerancePropalsToBill").'</td><td>';
print '<input size="5" name="PropalsToBill" value="'. ($conf->global->MAIN_DELAY_PROPALS_TO_BILL+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->service->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','service').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceNotActivatedServices").'</td><td>';
print '<input size="5" name="BoardNotActivatedServices" value="'. ($conf->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->service->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','service').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceRunningServices").'</td><td>';
print '<input size="5" name="BoardRunningServices" value="'. ($conf->global->MAIN_DELAY_RUNNING_SERVICES +0). '"> ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->facture->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','bill').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceCustomerBillsUnpaid").'</td><td>';
print '<input size="5" name="CustomerBillsUnpaid" value="'. ($conf->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->fournisseur->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','bill').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceSupplierBillsToPay").'</td><td>';
print '<input size="5" name="SupplierBillsToPay" value="'. ($conf->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->banque->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','account').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceTransactionsToConciliate").'</td><td>';
print '<input size="5" name="TransactionsToConciliate" value="'. ($conf->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE+0) . '"> ' . $langs->trans("days") . '</td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','account').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceChequesToDeposit").'</td><td>';
print '<input size="5" name="ChequesToDeposit" value="'. ($conf->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->adherent->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','user').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceMembers").'</td><td>';
print '<input size="5" name="Members" value="'. ($conf->global->MAIN_DELAY_MEMBERS+0). '"> ' . $langs->trans("days") . '</td></tr>';
} }
print '</table>'; print '</table>';
@ -209,98 +191,20 @@ else
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td width="120px">'.$langs->trans("Value").'</td></tr>'; print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td width="120px">'.$langs->trans("Value").'</td></tr>';
$var=true; $var=true;
$var=!$var; foreach($modules as $module => $delays)
if (! empty($conf->agenda->enabled))
{ {
print '<tr '.$bc[$var].'>'; if (! empty($conf->$module->enabled))
print '<td width="20px">'.img_object('','action').'</td>'; {
print '<td>'.$langs->trans("DelaysOfToleranceActionsToDo").'</td><td>' . ($conf->global->MAIN_DELAY_ACTIONS_TODO+0) . ' ' . $langs->trans("days") . '</td></tr>'; foreach($delays as $delay)
} {
$var=!$var;
if (! empty($conf->commande->enabled)) $value=(! empty($conf->global->$delay['code'])?$conf->global->$delay['code']:0);
{ print '<tr '.$bc[$var].'>';
$var=!$var; print '<td width="20px">'.img_object('',$delay['img']).'</td>';
print '<tr '.$bc[$var].'>'; print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';
print '<td width="20px">'.img_object('','order').'</td>'; print '<td>'.$value.' '.$langs->trans("days").'</td></tr>';
print '<td>'.$langs->trans("DelaysOfToleranceOrdersToProcess").'</td><td>' . ($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS+0) . ' ' . $langs->trans("days") . '</td></tr>'; }
} }
if (! empty($conf->fournisseur->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','order').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceSuppliersOrdersToProcess").'</td><td>' . ($conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS+0) . ' ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->propal->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','propal').'</td>';
print '<td>'.$langs->trans("DelaysOfTolerancePropalsToClose").'</td><td>' . ($conf->global->MAIN_DELAY_PROPALS_TO_CLOSE+0). ' ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->propal->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','propal').'</td>';
print '<td>'.$langs->trans("DelaysOfTolerancePropalsToBill").'</td><td>' . ($conf->global->MAIN_DELAY_PROPALS_TO_BILL+0) . ' ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->service->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','service').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceNotActivatedServices").'</td><td>' . ($conf->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES+0) . ' ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->service->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','service').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceRunningServices").'</td><td>' . ($conf->global->MAIN_DELAY_RUNNING_SERVICES+0). ' ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->facture->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','bill').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceCustomerBillsUnpaid").'</td><td>' . ($conf->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED+0) . ' ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->fournisseur->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','bill').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceSupplierBillsToPay").'</td><td>' . ($conf->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY+0) . ' ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->banque->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','account').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceTransactionsToConciliate").'</td><td>' . ($conf->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE+0) . ' ' . $langs->trans("days") . '</td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','account').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceChequesToDeposit").'</td><td>' . ($conf->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT+0) . ' ' . $langs->trans("days") . '</td></tr>';
}
if (! empty($conf->adherent->enabled))
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','user').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceMembers").'</td><td>' . ($conf->global->MAIN_DELAY_MEMBERS+0) . ' ' . $langs->trans("days") . '</td></tr>';
} }
print '</table>'; print '</table>';

88
htdocs/admin/dict.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011 Remy Younes <ryounes@gmail.com> * Copyright (C) 2011 Remy Younes <ryounes@gmail.com>
@ -279,24 +279,24 @@ $tabcond[1] = true;
$tabcond[2] = true; $tabcond[2] = true;
$tabcond[3] = true; $tabcond[3] = true;
$tabcond[4] = true; $tabcond[4] = true;
$tabcond[5] = $conf->societe->enabled||$conf->adherent->enabled; $tabcond[5] = (! empty($conf->societe->enabled) || ! empty($conf->adherent->enabled));
$tabcond[6] = $conf->agenda->enabled; $tabcond[6] = ! empty($conf->agenda->enabled);
$tabcond[7] = $conf->tax->enabled; $tabcond[7] = ! empty($conf->tax->enabled);
$tabcond[8] = $conf->societe->enabled; $tabcond[8] = ! empty($conf->societe->enabled);
$tabcond[9] = true; $tabcond[9] = true;
$tabcond[10]= true; $tabcond[10]= true;
$tabcond[11]= true; $tabcond[11]= true;
$tabcond[12]= $conf->commande->enabled||$conf->propal->enabled||$conf->facture->enabled||$conf->fournisseur->enabled; $tabcond[12]= (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled));
$tabcond[13]= $conf->commande->enabled||$conf->propal->enabled||$conf->facture->enabled||$conf->fournisseur->enabled; $tabcond[13]= (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled));
$tabcond[14]= $conf->product->enabled&&$conf->ecotax->enabled; $tabcond[14]= (! empty($conf->product->enabled) && ! empty($conf->ecotax->enabled));
$tabcond[15]= true; $tabcond[15]= true;
$tabcond[16]= $conf->societe->enabled && empty($conf->global->SOCIETE_DISABLE_PROSPECTS); $tabcond[16]= (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS));
$tabcond[17]= $conf->deplacement->enabled; $tabcond[17]= ! empty($conf->deplacement->enabled);
$tabcond[18]= $conf->expedition->enabled; $tabcond[18]= ! empty($conf->expedition->enabled);
$tabcond[19]= $conf->societe->enabled; $tabcond[19]= ! empty($conf->societe->enabled);
$tabcond[20]= $conf->fournisseur->enabled; $tabcond[20]= ! empty($conf->fournisseur->enabled);
$tabcond[21]= $conf->propal->enabled; $tabcond[21]= ! empty($conf->propal->enabled);
$tabcond[22]= $conf->commande->enabled||$conf->propal->enabled; $tabcond[22]= (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled));
// List of help for fields // List of help for fields
$tabhelp=array(); $tabhelp=array();
@ -347,7 +347,7 @@ if ($id == 11)
"facture"=>$langs->trans("Bill"), "facture"=>$langs->trans("Bill"),
"facture_fourn"=>$langs->trans("SupplierBill"), "facture_fourn"=>$langs->trans("SupplierBill"),
"fichinter"=>$langs->trans("InterventionCard")); "fichinter"=>$langs->trans("InterventionCard"));
if ($conf->global->MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES) $elementList["societe"]=$langs->trans("ThirdParty"); if (! empty($conf->global->MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES)) $elementList["societe"]=$langs->trans("ThirdParty");
$sourceList = array("internal"=>$langs->trans("Internal"), $sourceList = array("internal"=>$langs->trans("Internal"),
"external"=>$langs->trans("External")); "external"=>$langs->trans("External"));
} }
@ -356,7 +356,7 @@ $msg='';
// Actions ajout ou modification d'une entree dans un dictionnaire de donnee // Actions ajout ou modification d'une entree dans un dictionnaire de donnee
if ($_POST["actionadd"] || $_POST["actionmodify"]) if (GETPOST('actionadd') || GETPOST('actionmodify'))
{ {
$listfield=explode(',',$tabfield[$id]); $listfield=explode(',',$tabfield[$id]);
$listfieldinsert=explode(',',$tabfieldinsert[$id]); $listfieldinsert=explode(',',$tabfieldinsert[$id]);
@ -401,7 +401,7 @@ if ($_POST["actionadd"] || $_POST["actionmodify"])
} }
// Si verif ok et action add, on ajoute la ligne // Si verif ok et action add, on ajoute la ligne
if ($ok && $_POST["actionadd"]) if ($ok && GETPOST('actionadd'))
{ {
if ($tabrowid[$id]) if ($tabrowid[$id])
{ {
@ -466,7 +466,7 @@ if ($_POST["actionadd"] || $_POST["actionmodify"])
} }
// Si verif ok et action modify, on modifie la ligne // Si verif ok et action modify, on modifie la ligne
if ($ok && $_POST["actionmodify"]) if ($ok && GETPOST('actionmodify'))
{ {
if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; } if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
else { $rowidcol="rowid"; } else { $rowidcol="rowid"; }
@ -509,7 +509,7 @@ if ($_POST["actionadd"] || $_POST["actionmodify"])
$_GET["id"]=$_POST["id"]; // Force affichage dictionnaire en cours d'edition $_GET["id"]=$_POST["id"]; // Force affichage dictionnaire en cours d'edition
} }
if ($_POST["actioncancel"]) if (GETPOST('actioncancel'))
{ {
$_GET["id"]=$_POST["id"]; // Force affichage dictionnaire en cours d'edition $_GET["id"]=$_POST["id"]; // Force affichage dictionnaire en cours d'edition
} }
@ -619,7 +619,7 @@ if ($id)
// Complete requete recherche valeurs avec critere de tri // Complete requete recherche valeurs avec critere de tri
$sql=$tabsql[$id]; $sql=$tabsql[$id];
if ($_GET["sortfield"]) if (GETPOST('sortfield'))
{ {
// If sort order is "pays", we use pays_code instead // If sort order is "pays", we use pays_code instead
if ($_GET["sortfield"] == 'pays') $_GET["sortfield"]='pays_code'; if ($_GET["sortfield"] == 'pays') $_GET["sortfield"]='pays_code';
@ -687,7 +687,7 @@ if ($id)
if ($valuetoshow != '') if ($valuetoshow != '')
{ {
print '<td>'; print '<td>';
if (preg_match('/http:/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.'</a>'; if (! empty($tabhelp[$id][$value]) && preg_match('/http:/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.'</a>';
else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]); else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
else print $valuetoshow; else print $valuetoshow;
print '</td>'; print '</td>';
@ -704,7 +704,7 @@ if ($id)
$obj=''; $obj='';
// If data was already input, we define them in obj to populate input fields. // If data was already input, we define them in obj to populate input fields.
if ($_POST["actionadd"]) if (GETPOST('actionadd'))
{ {
foreach ($fieldlist as $key=>$val) foreach ($fieldlist as $key=>$val)
{ {
@ -795,7 +795,7 @@ if ($id)
//print_r($obj); //print_r($obj);
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
if ($action == 'edit' && ($rowid == ($obj->rowid?$obj->rowid:$obj->code))) if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
{ {
print '<form action="dict.php" method="post">'; print '<form action="dict.php" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -810,7 +810,7 @@ if ($id)
if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id]); if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id]);
print '<td colspan="3" align="right"><a name="'.($obj->rowid?$obj->rowid:$obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">'; print '<td colspan="3" align="right"><a name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>'; print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
} }
else else
@ -866,7 +866,7 @@ if ($id)
$key=$langs->trans("Action".strtoupper($obj->code)); $key=$langs->trans("Action".strtoupper($obj->code));
$valuetoshow=($obj->code && $key != "Action".strtoupper($obj->code))?$key:$obj->$fieldlist[$field]; $valuetoshow=($obj->code && $key != "Action".strtoupper($obj->code))?$key:$obj->$fieldlist[$field];
} }
else if ($fieldlist[$field]=='libelle' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_currencies') { else if (! empty($obj->code_iso) && $fieldlist[$field]=='libelle' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_currencies') {
$key=$langs->trans("Currency".strtoupper($obj->code_iso)); $key=$langs->trans("Currency".strtoupper($obj->code_iso));
$valuetoshow=($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso))?$key:$obj->$fieldlist[$field]; $valuetoshow=($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso))?$key:$obj->$fieldlist[$field];
} }
@ -926,18 +926,18 @@ if ($id)
if (isset($obj->code) && ($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) $iserasable=0; if (isset($obj->code) && ($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) $iserasable=0;
if (isset($obj->code) && $obj->code == 'RECEP') $iserasable=0; if (isset($obj->code) && $obj->code == 'RECEP') $iserasable=0;
if (isset($obj->code) && $obj->code == 'EF0') $iserasable=0; if (isset($obj->code) && $obj->code == 'EF0') $iserasable=0;
if ($obj->type && $obj->type == 'system') $iserasable=0; if (isset($obj->type) && $obj->type == 'system') $iserasable=0;
if ($iserasable) print '<a href="'.$_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.($obj->rowid?$obj->rowid:$obj->code).'&amp;code='.$obj->code.'&amp;id='.$id.'&amp;action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>'; if ($iserasable) print '<a href="'.$_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?$obj->code:'').'&amp;id='.$id.'&amp;action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
else print $langs->trans("AlwaysActive"); else print $langs->trans("AlwaysActive");
print "</td>"; print "</td>";
// Modify link // Modify link
if ($iserasable) print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.($obj->rowid?$obj->rowid:$obj->code).'&amp;code='.$obj->code.'&amp;id='.$id.'&amp;action=edit#'.($obj->rowid?$obj->rowid:$obj->code).'">'.img_edit().'</a></td>'; if ($iserasable) print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?$obj->code:'').'&amp;id='.$id.'&amp;action=edit#'.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'">'.img_edit().'</a></td>';
else print '<td>&nbsp;</td>'; else print '<td>&nbsp;</td>';
// Delete link // Delete link
if ($iserasable) print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.($obj->rowid?$obj->rowid:$obj->code).'&amp;code='.$obj->code.'&amp;id='.$id.'&amp;action=delete">'.img_delete().'</a></td>'; if ($iserasable) print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?$obj->code:'').'&amp;id='.$id.'&amp;action=delete">'.img_delete().'</a></td>';
else print '<td>&nbsp;</td>'; else print '<td>&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
@ -971,7 +971,7 @@ else
foreach ($taborder as $i) foreach ($taborder as $i)
{ {
if ($tabname[$i] && empty($tabcond[$i])) continue; if (isset($tabname[$i]) && empty($tabcond[$i])) continue;
if ($i) if ($i)
{ {
@ -1011,9 +1011,9 @@ else
print '<br>'; print '<br>';
$db->close();
llxFooter(); llxFooter();
$db->close();
/** /**
@ -1039,7 +1039,7 @@ function fieldList($fieldlist,$obj='',$tabname='')
if ($fieldlist[$field] == 'pays') { if ($fieldlist[$field] == 'pays') {
if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; } // For region page, we do not show the country input if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; } // For region page, we do not show the country input
print '<td>'; print '<td>';
print $form->select_country(($obj->pays_code?$obj->pays_code:$obj->pays),'pays'); print $form->select_country((! empty($obj->pays_code)?$obj->pays_code:(! empty($obj->pays)?$obj->pays:'')),'pays');
print '</td>'; print '</td>';
} }
elseif ($fieldlist[$field] == 'pays_id') { elseif ($fieldlist[$field] == 'pays_id') {
@ -1052,7 +1052,7 @@ function fieldList($fieldlist,$obj='',$tabname='')
print '</td>'; print '</td>';
} }
elseif ($fieldlist[$field] == 'region_id') { elseif ($fieldlist[$field] == 'region_id') {
$region_id = $obj->$fieldlist[$field]?$obj->$fieldlist[$field]:0; $region_id = (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:0);
print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">'; print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
} }
elseif ($fieldlist[$field] == 'lang') { elseif ($fieldlist[$field] == 'lang') {
@ -1064,14 +1064,14 @@ function fieldList($fieldlist,$obj='',$tabname='')
elseif ($fieldlist[$field] == 'element') elseif ($fieldlist[$field] == 'element')
{ {
print '<td>'; print '<td>';
print $form->selectarray('element', $elementList,$obj->$fieldlist[$field]); print $form->selectarray('element', $elementList,(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
print '</td>'; print '</td>';
} }
// La source de l'element (pour les type de contact).' // La source de l'element (pour les type de contact).'
elseif ($fieldlist[$field] == 'source') elseif ($fieldlist[$field] == 'source')
{ {
print '<td>'; print '<td>';
print $form->selectarray('source', $sourceList,$obj->$fieldlist[$field]); print $form->selectarray('source', $sourceList,(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
print '</td>'; print '</td>';
} }
elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm") elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
@ -1082,30 +1082,30 @@ function fieldList($fieldlist,$obj='',$tabname='')
} }
elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'fdm') { elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'fdm') {
print '<td>'; print '<td>';
print $form->selectyesno($fieldlist[$field],$obj->$fieldlist[$field],1); print $form->selectyesno($fieldlist[$field],(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''),1);
print '</td>'; print '</td>';
} }
elseif (in_array($fieldlist[$field],array('nbjour','decalage','taux','localtax1','localtax2'))) { elseif (in_array($fieldlist[$field],array('nbjour','decalage','taux','localtax1','localtax2'))) {
print '<td><input type="text" class="flat" value="'.$obj->$fieldlist[$field].'" size="3" name="'.$fieldlist[$field].'"></td>'; print '<td><input type="text" class="flat" value="'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="3" name="'.$fieldlist[$field].'"></td>';
} }
elseif ($fieldlist[$field] == 'libelle_facture') { elseif ($fieldlist[$field] == 'libelle_facture') {
print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.$obj->$fieldlist[$field].'</textarea></td>'; print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'</textarea></td>';
} }
elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) { elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) {
print '<td><input type="text" class="flat" value="'.price($obj->$fieldlist[$field]).'" size="8" name="'.$fieldlist[$field].'"></td>'; print '<td><input type="text" class="flat" value="'.price((! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'')).'" size="8" name="'.$fieldlist[$field].'"></td>';
} }
elseif ($fieldlist[$field] == 'code') { elseif ($fieldlist[$field] == 'code' && isset($obj->$fieldlist[$field])) {
print '<td><input type="text" class="flat" value="'.$obj->$fieldlist[$field].'" size="10" name="'.$fieldlist[$field].'"></td>'; print '<td><input type="text" class="flat" value="'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="10" name="'.$fieldlist[$field].'"></td>';
} }
elseif ($fieldlist[$field]=='unit') { elseif ($fieldlist[$field]=='unit') {
print '<td>'; print '<td>';
print $form->selectarray('unit',array('mm','cm','point','inch'),$obj->$fieldlist[$field],0,0,1); print $form->selectarray('unit',array('mm','cm','point','inch'),(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''),0,0,1);
print '</td>'; print '</td>';
} }
else else
{ {
print '<td>'; print '<td>';
print '<input type="text" '.($fieldlist[$field]=='libelle'?'size="32" ':'').' class="flat" value="'.$obj->$fieldlist[$field].'" name="'.$fieldlist[$field].'">'; print '<input type="text" '.($fieldlist[$field]=='libelle'?'size="32" ':'').' class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" name="'.$fieldlist[$field].'">';
print '</td>'; print '</td>';
} }
} }

91
htdocs/admin/mails.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2007-2012 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2007-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2009-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
@ -32,7 +32,7 @@ $langs->load("mails");
$langs->load("other"); $langs->load("other");
$langs->load("errors"); $langs->load("errors");
if (!$user->admin) accessforbidden(); if (! $user->admin) accessforbidden();
$substitutionarrayfortest=array( $substitutionarrayfortest=array(
'__LOGIN__' => $user->login, '__LOGIN__' => $user->login,
@ -46,6 +46,7 @@ $substitutionarrayfortest=array(
complete_substitutions_array($substitutionarrayfortest, $langs); complete_substitutions_array($substitutionarrayfortest, $langs);
$action=GETPOST('action'); $action=GETPOST('action');
$message='';
/* /*
@ -75,7 +76,7 @@ if ($action == 'update' && empty($_POST["cancel"]))
/* /*
* Add file in email form * Add file in email form
*/ */
if ($_POST['addfile'] || $_POST['addfilehtml']) if (GETPOST('addfile') || GETPOST('addfilehtml'))
{ {
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
@ -163,7 +164,7 @@ if (! empty($_POST['removedfile']) || ! empty($_POST['removedfilehtml']))
/* /*
* Cancel * Cancel
*/ */
if (($action == 'send' || $action == 'sendhtml') && $_POST['cancel']) if (($action == 'send' || $action == 'sendhtml') && GETPOST('cancel'))
{ {
$message=''; $message='';
} }
@ -171,7 +172,7 @@ if (($action == 'send' || $action == 'sendhtml') && $_POST['cancel'])
/* /*
* Send mail * Send mail
*/ */
if (($action == 'send' || $action == 'sendhtml') && ! $_POST['addfile'] && ! $_POST['addfilehtml'] && ! $_POST["removedfile"] && ! $_POST['cancel']) if (($action == 'send' || $action == 'sendhtml') && ! GETPOST('addfile') && ! GETPOST('addfilehtml') && ! GETPOST('removedfile') && ! GETPOST('cancel'))
{ {
$error=0; $error=0;
@ -378,22 +379,23 @@ if ($action == 'edit')
} }
else else
{ {
$mainserver = (! empty($conf->global->MAIN_MAIL_SMTP_SERVER)?$conf->global->MAIN_MAIL_SMTP_SERVER:'');
$smtpserver = ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined"); $smtpserver = ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined");
if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike"); if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
else print $langs->trans("MAIN_MAIL_SMTP_SERVER",$smtpserver); else print $langs->trans("MAIN_MAIL_SMTP_SERVER",$smtpserver);
print '</td><td>'; print '</td><td>';
// SuperAdministrator access only // SuperAdministrator access only
if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity)) if (empty($conf->multicompany->enabled) || ($user->admin && ! $user->entity))
{ {
print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" size="18" value="' . $conf->global->MAIN_MAIL_SMTP_SERVER . '">'; print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" size="18" value="' . $mainserver . '">';
print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_sav" name="MAIN_MAIL_SMTP_SERVER_sav" value="' . $conf->global->MAIN_MAIL_SMTP_SERVER . '">'; print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_sav" name="MAIN_MAIL_SMTP_SERVER_sav" value="' . $mainserver . '">';
} }
else else
{ {
$text = $conf->global->MAIN_MAIL_SMTP_SERVER ? $conf->global->MAIN_MAIL_SMTP_SERVER : $smtpserver; $text = ! empty($mainserver) ? $mainserver : $smtpserver;
$htmltext = $langs->trans("ContactSuperAdminForChange"); $htmltext = $langs->trans("ContactSuperAdminForChange");
print $form->textwithpicto($text,$htmltext,1,'superadmin'); print $form->textwithpicto($text,$htmltext,1,'superadmin');
print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" value="'.$conf->global->MAIN_MAIL_SMTP_SERVER.'">'; print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" value="'.$mainserver.'">';
} }
} }
print '</td></tr>'; print '</td></tr>';
@ -409,60 +411,63 @@ if ($action == 'edit')
} }
else else
{ {
$mainport = (! empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '');
$smtpport = ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined"); $smtpport = ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined");
if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike"); if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
else print $langs->trans("MAIN_MAIL_SMTP_PORT",$smtpport); else print $langs->trans("MAIN_MAIL_SMTP_PORT",$smtpport);
print '</td><td>'; print '</td><td>';
// SuperAdministrator access only // SuperAdministrator access only
if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity)) if (empty($conf->multicompany->enabled) || ($user->admin && ! $user->entity))
{ {
print '<input class="flat" id="MAIN_MAIL_SMTP_PORT" name="MAIN_MAIL_SMTP_PORT" size="3" value="' . $conf->global->MAIN_MAIL_SMTP_PORT . '">'; print '<input class="flat" id="MAIN_MAIL_SMTP_PORT" name="MAIN_MAIL_SMTP_PORT" size="3" value="' . $mainport . '">';
print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_sav" name="MAIN_MAIL_SMTP_PORT_sav" value="' . $conf->global->MAIN_MAIL_SMTP_PORT . '">'; print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_sav" name="MAIN_MAIL_SMTP_PORT_sav" value="' . $mainport . '">';
} }
else else
{ {
$text = $conf->global->MAIN_MAIL_SMTP_PORT ? $conf->global->MAIN_MAIL_SMTP_PORT : $smtpport; $text = (! empty($mainport) ? $mainport : $smtpport);
$htmltext = $langs->trans("ContactSuperAdminForChange"); $htmltext = $langs->trans("ContactSuperAdminForChange");
print $form->textwithpicto($text,$htmltext,1,'superadmin'); print $form->textwithpicto($text,$htmltext,1,'superadmin');
print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT" name="MAIN_MAIL_SMTP_PORT" value="'.$conf->global->MAIN_MAIL_SMTP_PORT.'">'; print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT" name="MAIN_MAIL_SMTP_PORT" value="'.$mainport.'">';
} }
} }
print '</td></tr>'; print '</td></tr>';
// ID // ID
if ($conf->use_javascript_ajax || $conf->global->MAIN_MAIL_SENDMODE == 'smtps') if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'smtps'))
{ {
$var=!$var; $var=!$var;
$mainstmpid=(! empty($conf->global->MAIN_MAIL_SMTPS_ID)?$conf->global->MAIN_MAIL_SMTPS_ID:'');
print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'; print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
// SuperAdministrator access only // SuperAdministrator access only
if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity)) if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
{ {
print '<input class="flat" name="MAIN_MAIL_SMTPS_ID" size="32" value="' . $conf->global->MAIN_MAIL_SMTPS_ID . '">'; print '<input class="flat" name="MAIN_MAIL_SMTPS_ID" size="32" value="' . $mainstmpid . '">';
} }
else else
{ {
$htmltext = $langs->trans("ContactSuperAdminForChange"); $htmltext = $langs->trans("ContactSuperAdminForChange");
print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID,$htmltext,1,'superadmin'); print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID,$htmltext,1,'superadmin');
print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID" value="'.$conf->global->MAIN_MAIL_SMTPS_ID.'">'; print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID" value="'.$mainstmpid.'">';
} }
print '</td></tr>'; print '</td></tr>';
} }
// PW // PW
if ($conf->use_javascript_ajax || $conf->global->MAIN_MAIL_SENDMODE == 'smtps') if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'smtps'))
{ {
$var=!$var; $var=!$var;
$mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW)?$conf->global->MAIN_MAIL_SMTPS_PW:'');
print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'; print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
// SuperAdministrator access only // SuperAdministrator access only
if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity)) if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
{ {
print '<input class="flat" name="MAIN_MAIL_SMTPS_PW" size="32" value="' . $conf->global->MAIN_MAIL_SMTPS_PW . '">'; print '<input class="flat" name="MAIN_MAIL_SMTPS_PW" size="32" value="' . $mainsmtppw . '">';
} }
else else
{ {
$htmltext = $langs->trans("ContactSuperAdminForChange"); $htmltext = $langs->trans("ContactSuperAdminForChange");
print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW,$htmltext,1,'superadmin'); print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW,$htmltext,1,'superadmin');
print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW" value="'.$conf->global->MAIN_MAIL_SMTPS_PW.'">'; print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW" value="'.$mainsmtppw.'">';
} }
print '</td></tr>'; print '</td></tr>';
} }
@ -470,11 +475,11 @@ if ($action == 'edit')
// TLS // TLS
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
if ($conf->use_javascript_ajax || $conf->global->MAIN_MAIL_SENDMODE == 'smtps') if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'smtps'))
{ {
if (function_exists('openssl_open')) if (function_exists('openssl_open'))
{ {
print $form->selectyesno('MAIN_MAIL_EMAIL_TLS',$conf->global->MAIN_MAIL_EMAIL_TLS,1); print $form->selectyesno('MAIN_MAIL_EMAIL_TLS',(! empty($conf->global->MAIN_MAIL_EMAIL_TLS)?$conf->global->MAIN_MAIL_EMAIL_TLS:0),1);
} }
else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')'; else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
} }
@ -488,19 +493,19 @@ if ($action == 'edit')
// From // From
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
print '<td><input class="flat" name="MAIN_MAIL_EMAIL_FROM" size="32" value="' . $conf->global->MAIN_MAIL_EMAIL_FROM; print '<td><input class="flat" name="MAIN_MAIL_EMAIL_FROM" size="32" value="' . (! empty($conf->global->MAIN_MAIL_EMAIL_FROM)?$conf->global->MAIN_MAIL_EMAIL_FROM:'');
print '"></td></tr>'; print '"></td></tr>';
// From // From
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
print '<td><input class="flat" name="MAIN_MAIL_ERRORS_TO" size="32" value="' . $conf->global->MAIN_MAIL_ERRORS_TO; print '<td><input class="flat" name="MAIN_MAIL_ERRORS_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_ERRORS_TO)?$conf->global->MAIN_MAIL_ERRORS_TO:'');
print '"></td></tr>'; print '"></td></tr>';
// Autocopy to // Autocopy to
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
print '<td><input class="flat" name="MAIN_MAIL_AUTOCOPY_TO" size="32" value="' . $conf->global->MAIN_MAIL_AUTOCOPY_TO; print '<td><input class="flat" name="MAIN_MAIL_AUTOCOPY_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)?$conf->global->MAIN_MAIL_AUTOCOPY_TO:'');
print '"></td></tr>'; print '"></td></tr>';
print '</table>'; print '</table>';
@ -538,36 +543,36 @@ else
// Server // Server
$var=!$var; $var=!$var;
if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
{ {
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
} }
else else
{ {
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER",ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined")).'</td><td>'.$conf->global->MAIN_MAIL_SMTP_SERVER.'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER",ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined")).'</td><td>'.(! empty($conf->global->MAIN_MAIL_SMTP_SERVER)?$conf->global->MAIN_MAIL_SMTP_SERVER:'').'</td></tr>';
} }
// Port // Port
$var=!$var; $var=!$var;
if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
{ {
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
} }
else else
{ {
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT",ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined")).'</td><td>'.$conf->global->MAIN_MAIL_SMTP_PORT.'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT",ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined")).'</td><td>'.(! empty($conf->global->MAIN_MAIL_SMTP_PORT)?$conf->global->MAIN_MAIL_SMTP_PORT:'').'</td></tr>';
} }
// SMTPS ID // SMTPS ID
$var=!$var; $var=!$var;
if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') if (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'smtps')
{ {
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
} }
// SMTPS PW // SMTPS PW
$var=!$var; $var=!$var;
if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') if (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'smtps')
{ {
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>';
} }
@ -575,7 +580,7 @@ else
// TLS // TLS
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') if (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'smtps')
{ {
if (function_exists('openssl_open')) if (function_exists('openssl_open'))
{ {
@ -594,21 +599,29 @@ else
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
print '<td>'.$conf->global->MAIN_MAIL_EMAIL_FROM; print '<td>'.$conf->global->MAIN_MAIL_EMAIL_FROM;
if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && ! isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail")); if (! empty($conf->global->MAIN_MAIL_EMAIL_FROM) && ! isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
print '</td></tr>'; print '</td></tr>';
// Errors To // Errors To
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
print '<td>'.$conf->global->MAIN_MAIL_ERRORS_TO; print '<td>'.$conf->global->MAIN_MAIL_ERRORS_TO;
if (!empty($conf->global->MAIN_MAIL_ERRORS_TO) && ! isValidEmail($conf->global->MAIN_MAIL_ERRORS_TO)) print img_warning($langs->trans("ErrorBadEMail")); if (! empty($conf->global->MAIN_MAIL_ERRORS_TO) && ! isValidEmail($conf->global->MAIN_MAIL_ERRORS_TO)) print img_warning($langs->trans("ErrorBadEMail"));
print '</td></tr>'; print '</td></tr>';
// Autocopy to // Autocopy to
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
print '<td>'.$conf->global->MAIN_MAIL_AUTOCOPY_TO; print '<td>';
if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && ! isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail")); if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO))
{
print $conf->global->MAIN_MAIL_AUTOCOPY_TO;
if (! isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
}
else
{
print '&nbsp;';
}
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';

10
htdocs/admin/user.php
View File

@ -33,8 +33,7 @@ $langs->load("admin");
$langs->load("members"); $langs->load("members");
$langs->load("users"); $langs->load("users");
if (!$user->admin) if (! $user->admin) accessforbidden();
accessforbidden();
/* /*
* Action * Action
@ -115,11 +114,8 @@ else
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
print '<br>'; print '<br><br>';
$db->close();
print '<br>';
llxFooter(); llxFooter();
$db->close();
?> ?>

73
htdocs/compta/dons/fiche.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* 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
@ -34,14 +35,16 @@ $langs->load("companies");
$langs->load("donations"); $langs->load("donations");
$langs->load("bills"); $langs->load("bills");
$id=GETPOST('rowid')?GETPOST('rowid'):GETPOST('id','int'); $id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int');
$action=GETPOST('action'); $action=GETPOST('action','alpha');
$cancel=GETPOST('cancel');
$amount=GETPOST('amount');
$mesg=""; $mesg="";
$mesgs=array(); $mesgs=array();
$don = new Don($db); $don = new Don($db);
$donation_date=dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); $donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
// Security check // Security check
$result = restrictedArea($user, 'don', $id); $result = restrictedArea($user, 'don', $id);
@ -53,9 +56,9 @@ $result = restrictedArea($user, 'don', $id);
if ($action == 'update') if ($action == 'update')
{ {
if (! empty($_POST['cancel'])) if (! empty($cancel))
{ {
Header("Location: fiche.php?rowid=".$_POST["rowid"]); Header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
exit; exit;
} }
@ -68,7 +71,7 @@ if ($action == 'update')
$error++; $error++;
} }
if (! $_POST["amount"] > 0) if (empty($amount))
{ {
$mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Amount")); $mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Amount"));
$action = "create"; $action = "create";
@ -77,8 +80,7 @@ if ($action == 'update')
if (! $error) if (! $error)
{ {
$don->id = $_POST["rowid"]; $don->fetch($id);
$don->fetch($_POST["rowid"]);
$don->prenom = $_POST["prenom"]; $don->prenom = $_POST["prenom"];
$don->nom = $_POST["nom"]; $don->nom = $_POST["nom"];
@ -100,7 +102,7 @@ if ($action == 'update')
if ($don->update($user) > 0) if ($don->update($user) > 0)
{ {
Header("Location: fiche.php?rowid=".$don->id); Header("Location: ".$_SERVER['PHP_SELF']."?id=".$don->id);
exit; exit;
} }
} }
@ -108,7 +110,7 @@ if ($action == 'update')
if ($action == 'add') if ($action == 'add')
{ {
if (! empty($_POST['cancel'])) if (! empty($cancel))
{ {
Header("Location: index.php"); Header("Location: index.php");
exit; exit;
@ -119,14 +121,14 @@ if ($action == 'add')
if (empty($donation_date)) if (empty($donation_date))
{ {
$mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Date")); $mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Date"));
$_GET["action"] = "create"; $action = "create";
$error++; $error++;
} }
if (! $_POST["amount"] > 0) if (empty($amount))
{ {
$mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Amount")); $mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Amount"));
$_GET["action"] = "create"; $action = "create";
$error++; $error++;
} }
@ -160,48 +162,47 @@ if ($action == 'add')
if ($action == 'delete') if ($action == 'delete')
{ {
$don->delete($_GET["rowid"]); $don->delete($id);
Header("Location: liste.php"); Header("Location: liste.php");
exit; exit;
} }
if ($action == 'commentaire') if ($action == 'commentaire')
{ {
$don->fetch($_POST["rowid"]); $don->fetch($id);
$don->update_note($_POST["commentaire"]); $don->update_note($_POST["commentaire"]);
$_GET["rowid"] = $_POST["rowid"];
} }
if ($action == 'valid_promesse') if ($action == 'valid_promesse')
{ {
if ($don->valid_promesse($_GET["rowid"], $user->id) >= 0) if ($don->valid_promesse($id, $user->id) >= 0)
{ {
Header("Location: fiche.php?rowid=".$_GET["rowid"]); Header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
exit; exit;
} }
else $mesg=$don->error; else $mesg=$don->error;
} }
if ($action == 'set_cancel') if ($action == 'set_cancel')
{ {
if ($don->set_cancel($_GET["rowid"]) >= 0) if ($don->set_cancel($id) >= 0)
{ {
Header("Location: fiche.php?rowid=".$_GET["rowid"]); Header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
exit; exit;
} }
else $mesg=$don->error; else $mesg=$don->error;
} }
if ($action == 'set_paid') if ($action == 'set_paid')
{ {
if ($don->set_paye($_GET["rowid"], $modepaiement) >= 0) if ($don->set_paye($id, $modepaiement) >= 0)
{ {
Header("Location: fiche.php?rowid=".$_GET["rowid"]); Header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
exit; exit;
} }
else $mesg=$don->error; else $mesg=$don->error;
} }
if ($action == 'set_encaisse') if ($action == 'set_encaisse')
{ {
if ($don->set_encaisse($_GET["rowid"]) >= 0) if ($don->set_encaisse($id) >= 0)
{ {
Header("Location: fiche.php?rowid=".$_GET["rowid"]); Header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
exit; exit;
} }
else $mesg=$don->error; else $mesg=$don->error;
@ -213,7 +214,7 @@ if ($action == 'set_encaisse')
if ($action == 'builddoc') if ($action == 'builddoc')
{ {
$donation = new Don($db); $donation = new Don($db);
$donation->fetch($_GET['rowid']); $donation->fetch($id);
if ($_REQUEST['model']) if ($_REQUEST['model'])
{ {
@ -238,7 +239,7 @@ if ($action == 'builddoc')
} }
else else
{ {
Header('Location: '.$_SERVER["PHP_SELF"].'?rowid='.$donation->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc')); Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$donation->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
exit; exit;
} }
} }
@ -332,12 +333,12 @@ if ($action == 'create')
/* */ /* */
/* ************************************************************ */ /* ************************************************************ */
if ($id && $_GET["action"] == 'edit') if (! empty($id) && $action == 'edit')
{ {
$don->fetch($id); $don->fetch($id);
$h=0; $h=0;
$head[$h][0] = DOL_URL_ROOT."/compta/dons/fiche.php?rowid=".$_GET["rowid"]; $head[$h][0] = $_SERVER['PHP_SELF']."?id=".$don->id;
$head[$h][1] = $langs->trans("Card"); $head[$h][1] = $langs->trans("Card");
$hselected=$h; $hselected=$h;
$h++; $h++;
@ -401,11 +402,11 @@ if ($id && $_GET["action"] == 'edit')
print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$don->getLibStatut(4).'</td></tr>'; print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$don->getLibStatut(4).'</td></tr>';
// Project // Project
if ($conf->projet->enabled) if (! empty($conf->projet->enabled))
{ {
$langs->load('projects'); $langs->load('projects');
print '<tr><td>'.$langs->trans('Project').'</td><td>'; print '<tr><td>'.$langs->trans('Project').'</td><td>';
select_projects($soc->id, isset($_POST["projectid"])?$_POST["projectid"]:$don->fk_project, 'projectid'); select_projects(-1, (isset($_POST["projectid"])?$_POST["projectid"]:$don->fk_project), 'projectid');
print '</td></tr>'; print '</td></tr>';
} }
@ -425,12 +426,12 @@ if ($id && $_GET["action"] == 'edit')
/* Fiche don en mode visu */ /* Fiche don en mode visu */
/* */ /* */
/* ************************************************************ */ /* ************************************************************ */
if ($id && $action != 'edit') if (! empty($id) && $action != 'edit')
{ {
$result=$don->fetch($id); $result=$don->fetch($id);
$h=0; $h=0;
$head[$h][0] = DOL_URL_ROOT."/compta/dons/fiche.php?rowid=".$_GET["rowid"]; $head[$h][0] = $_SERVER['PHP_SELF']."?id=".$don->id;
$head[$h][1] = $langs->trans("Card"); $head[$h][1] = $langs->trans("Card");
$hselected=$h; $hselected=$h;
$h++; $h++;
@ -565,8 +566,6 @@ if ($id && $action != 'edit')
} }
$db->close();
llxFooter(); llxFooter();
$db->close();
?> ?>

26
htdocs/compta/dons/index.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* 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
@ -27,7 +28,8 @@ require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php");
$langs->load("donations"); $langs->load("donations");
if (!$user->rights->don->lire) accessforbidden(); // Security check
$result = restrictedArea($user, 'don');
$donation_static=new Don($db); $donation_static=new Don($db);
@ -48,17 +50,19 @@ $donstatic=new Don($db);
$help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Subvenciones'; $help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Subvenciones';
llxHeader('',$langs->trans("Donations"),$help_url); llxHeader('',$langs->trans("Donations"),$help_url);
$nb=array();
$somme=array();
$sql = "SELECT count(d.rowid) as nb, sum(d.amount) as somme , d.fk_statut"; $sql = "SELECT count(d.rowid) as nb, sum(d.amount) as somme , d.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."don as d"; $sql.= " FROM ".MAIN_DB_PREFIX."don as d";
$sql.= " GROUP BY d.fk_statut"; $sql.= " GROUP BY d.fk_statut";
$sql.= " ORDER BY d.fk_statut"; $sql.= " ORDER BY d.fk_statut";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$i = 0;
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0;
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
@ -107,17 +111,19 @@ print '<td align="right">'.$langs->trans("Total").'</td>';
print '<td align="right">'.$langs->trans("Average").'</td>'; print '<td align="right">'.$langs->trans("Average").'</td>';
print '</tr>'; print '</tr>';
$total=0;
$totalnb=0;
$var=true; $var=true;
foreach ($listofstatus as $status) foreach ($listofstatus as $status)
{ {
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td><a href="liste.php?statut='.$status.'">'.$donstatic->LibStatut($status,4).'</a></td>'; print '<td><a href="liste.php?statut='.$status.'">'.$donstatic->LibStatut($status,4).'</a></td>';
print '<td align="right">'.$nb[$status].'</td>'; print '<td align="right">'.(! empty($nb[$status])?$nb[$status]:'&nbsp;').'</td>';
print '<td align="right">'.($nb[$status]?price($somme[$status],'MT'):'&nbsp;').'</td>'; print '<td align="right">'.(! empty($nb[$status])?price($somme[$status],'MT'):'&nbsp;').'</td>';
print '<td align="right">'.($nb[$status]?price(price2num($somme[$status]/$nb[$status],'MT')):'&nbsp;').'</td>'; print '<td align="right">'.(! empty($nb[$status])?price(price2num($somme[$status]/$nb[$status],'MT')):'&nbsp;').'</td>';
$totalnb += $nb[$status]; $totalnb += (! empty($nb[$status])?$nb[$status]:0);
$total += $somme[$status]; $total += (! empty($somme[$status])?$somme[$status]:0);
print "</tr>"; print "</tr>";
} }

17
htdocs/compta/dons/liste.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* 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
@ -24,7 +25,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); if (! empty($conf->projet->enabled)) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("donations"); $langs->load("donations");
@ -83,10 +84,10 @@ if (trim($search_name) != '')
$sql.= $db->order($sortfield,$sortorder); $sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($limit+1, $offset); $sql.= $db->plimit($limit+1, $offset);
$result = $db->query($sql); $resql = $db->query($sql);
if ($result) if ($resql)
{ {
$num = $db->num_rows($result); $num = $db->num_rows($resql);
$i = 0; $i = 0;
$param="&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"; $param="&statut=$statut&sortorder=$sortorder&sortfield=$sortfield";
@ -110,7 +111,7 @@ if ($result)
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"d.societe","&page=$page&statut=$statut","","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"d.societe","&page=$page&statut=$statut","","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.nom","&page=$page&statut=$statut","","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.nom","&page=$page&statut=$statut","","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.datedon","&page=$page&statut=$statut","",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.datedon","&page=$page&statut=$statut","",'align="center"',$sortfield,$sortorder);
if ($conf->projet->enabled) if (! empty($conf->projet->enabled))
{ {
$langs->load("projects"); $langs->load("projects");
print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"fk_don_projet","&page=$page&statut=$statut","","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"fk_don_projet","&page=$page&statut=$statut","","",$sortfield,$sortorder);
@ -133,7 +134,7 @@ if ($result)
print '<td class="liste_titre" align="left">'; print '<td class="liste_titre" align="left">';
print '&nbsp;'; print '&nbsp;';
print '</td>'; print '</td>';
if ($conf->projet->enabled) if (! empty($conf->projet->enabled))
{ {
print '<td class="liste_titre" align="right">'; print '<td class="liste_titre" align="right">';
print '&nbsp;'; print '&nbsp;';

15
htdocs/compta/facture.php
View File

@ -38,8 +38,8 @@ require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); if (! empty($conf->commande->enabled)) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
if ($conf->projet->enabled) if (! empty($conf->projet->enabled))
{ {
require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
@ -52,6 +52,9 @@ $langs->load('companies');
$langs->load('products'); $langs->load('products');
$langs->load('main'); $langs->load('main');
$mesg='';
$errors=array();
if (GETPOST('mesg','int',1) && isset($_SESSION['message'])) $mesg=$_SESSION['message']; if (GETPOST('mesg','int',1) && isset($_SESSION['message'])) $mesg=$_SESSION['message'];
$sall=trim(GETPOST('sall')); $sall=trim(GETPOST('sall'));
@ -82,7 +85,7 @@ $result = restrictedArea($user, 'facture', $id,'','','fk_soc',$fieldid);
// Nombre de ligne pour choix de produit/service predefinis // Nombre de ligne pour choix de produit/service predefinis
$NBLINES=4; $NBLINES=4;
$usehm=$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE; $usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0);
$object=new Facture($db); $object=new Facture($db);
@ -1286,7 +1289,7 @@ else if ($action == 'down' && $user->rights->facture->creer)
/* /*
* Add file in email form * Add file in email form
*/ */
if ($_POST['addfile']) if (GETPOST('addfile'))
{ {
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
@ -2372,7 +2375,7 @@ else if ($id > 0 || ! empty($ref))
print '<table class="nobordernopadding" width="100%">'; print '<table class="nobordernopadding" width="100%">';
print '<tr><td>'.$langs->trans('Company').'</td>'; print '<tr><td>'.$langs->trans('Company').'</td>';
print '</td><td colspan="5">'; print '</td><td colspan="5">';
if ($conf->global->FACTURE_CHANGE_THIRDPARTY && $action != 'editthirdparty' && $object->brouillon && $user->rights->facture->creer) if (! empty($conf->global->FACTURE_CHANGE_THIRDPARTY) && $action != 'editthirdparty' && $object->brouillon && $user->rights->facture->creer)
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'),1).'</a></td>'; print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'),1).'</a></td>';
print '</tr></table>'; print '</tr></table>';
print '</td><td colspan="5">'; print '</td><td colspan="5">';
@ -3017,7 +3020,7 @@ else if ($id > 0 || ! empty($ref))
} }
} }
if ($conf->global->FACTURE_SHOW_SEND_REMINDER) // For backward compatibility if (! empty($conf->global->FACTURE_SHOW_SEND_REMINDER)) // For backward compatibility
{ {
if (($object->statut == 1 || $object->statut == 2) && $resteapayer > 0) if (($object->statut == 1 || $object->statut == 2) && $resteapayer > 0)
{ {

7
htdocs/contact/canvas/actions_contactcard_common.class.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2010-2011 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2010-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
@ -227,9 +227,10 @@ abstract class ActionsContactCardCommon
* Set content of ->tpl array, to use into template * Set content of ->tpl array, to use into template
* *
* @param string &$action Type of action * @param string &$action Type of action
* @param int $id Id
* @return string HTML output * @return string HTML output
*/ */
function assign_values(&$action) function assign_values(&$action, $id)
{ {
global $conf, $langs, $user, $canvas; global $conf, $langs, $user, $canvas;
global $form, $formcompany, $objsoc; global $form, $formcompany, $objsoc;
@ -273,7 +274,7 @@ abstract class ActionsContactCardCommon
$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civilite_id); $this->tpl['select_civility'] = $formcompany->select_civility($this->object->civilite_id);
// Predefined with third party // Predefined with third party
if ($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS))
{ {
if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address; if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip; if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;

14
htdocs/contact/canvas/default/actions_contactcard_default.class.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2010-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* 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
@ -38,15 +38,15 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
/** /**
* Constructor * Constructor
* *
* @param DoliDB $DB Handler acces base de donnees * @param DoliDB $db Handler acces base de donnees
* @param string $dirmodule Name of directory of module * @param string $dirmodule Name of directory of module
* @param string $targetmodule Name of directory of module where canvas is stored * @param string $targetmodule Name of directory of module where canvas is stored
* @param string $canvas Name of canvas * @param string $canvas Name of canvas
* @param string $card Name of tab (sub-canvas) * @param string $card Name of tab (sub-canvas)
*/ */
function __construct($DB, $dirmodule, $targetmodule, $canvas, $card) function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
{ {
$this->db = $DB; $this->db = $db;
$this->dirmodule = $dirmodule; $this->dirmodule = $dirmodule;
$this->targetmodule = $targetmodule; $this->targetmodule = $targetmodule;
$this->canvas = $canvas; $this->canvas = $canvas;
@ -86,7 +86,7 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
$ret = $this->getObject($id); $ret = $this->getObject($id);
parent::assign_values($action); parent::assign_values($action, $id);
$this->tpl['title'] = $this->getTitle($action); $this->tpl['title'] = $this->getTitle($action);
$this->tpl['error'] = $this->error; $this->tpl['error'] = $this->error;
@ -102,7 +102,7 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
$this->tpl['showend']=dol_get_fiche_end(); $this->tpl['showend']=dol_get_fiche_end();
$objsoc = new Societe($db); $objsoc = new Societe($db);
$objsoc->fetch($this->object->fk_soc); $objsoc->fetch($this->object->socid);
$this->tpl['actionstodo']=show_actions_todo($conf,$langs,$db,$objsoc,$this->object,1); $this->tpl['actionstodo']=show_actions_todo($conf,$langs,$db,$objsoc,$this->object,1);

2
htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
View File

@ -40,7 +40,7 @@ echo $this->control->tpl['ajax_selectcountry'];
<input type="hidden" name="contactid" value="<?php echo $this->control->tpl['id']; ?>"> <input type="hidden" name="contactid" value="<?php echo $this->control->tpl['id']; ?>">
<input type="hidden" name="old_name" value="<?php echo $this->control->tpl['name']; ?>"> <input type="hidden" name="old_name" value="<?php echo $this->control->tpl['name']; ?>">
<input type="hidden" name="old_firstname" value="<?php echo $this->control->tpl['firstname']; ?>"> <input type="hidden" name="old_firstname" value="<?php echo $this->control->tpl['firstname']; ?>">
<?php if ($this->control->tpl['company_id']) { ?> <?php if (! empty($this->control->tpl['company_id'])) { ?>
<input type="hidden" name="socid" value="<?php echo $this->control->tpl['company_id']; ?>"> <input type="hidden" name="socid" value="<?php echo $this->control->tpl['company_id']; ?>">
<?php } ?> <?php } ?>

6
htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2010-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
@ -26,8 +26,8 @@ $contact = $GLOBALS['objcanvas']->control->object;
dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']); dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']);
?> ?>
<?php if ($this->control->tpl['action_create_user']) echo $this->control->tpl['action_create_user']; ?> <?php if (! empty($this->control->tpl['action_create_user'])) echo $this->control->tpl['action_create_user']; ?>
<?php if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?> <?php if (! empty($this->control->tpl['action_delete'])) echo $this->control->tpl['action_delete']; ?>
<table class="border allwidth"> <table class="border allwidth">

3
htdocs/contact/class/contact.class.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2008 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerker@telenet.be> * Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerker@telenet.be>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr> * Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* *
@ -534,7 +534,6 @@ class Contact extends CommonObject
$this->mail = $obj->email; $this->mail = $obj->email;
$this->birthday = $this->db->jdate($obj->birthday); $this->birthday = $this->db->jdate($obj->birthday);
$this->birthday_alert = $obj->birthday_alert;
$this->note = $obj->note; $this->note = $obj->note;
$this->default_lang = $obj->default_lang; $this->default_lang = $obj->default_lang;
$this->user_id = $obj->user_id; $this->user_id = $obj->user_id;

3
htdocs/contact/fiche.php
View File

@ -50,7 +50,8 @@ $object = new Contact($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($id); $object->getCanvas($id);
$canvas = $object->canvas?$object->canvas:GETPOST("canvas"); $objcanvas=null;
$canvas = (! empty($object->canvas)?$object->canvas:GETPOST("canvas"));
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");

21
htdocs/contact/list.php
View File

@ -31,7 +31,7 @@ $langs->load("companies");
$langs->load("suppliers"); $langs->load("suppliers");
// Security check // Security check
$contactid = isset($_GET["id"])?$_GET["id"]:''; $contactid = GETPOST('id','int');
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'contact', $contactid,''); $result = restrictedArea($user, 'contact', $contactid,'');
@ -54,6 +54,8 @@ $sall=GETPOST("contactname");
$sortfield = GETPOST("sortfield"); $sortfield = GETPOST("sortfield");
$sortorder = GETPOST("sortorder"); $sortorder = GETPOST("sortorder");
$page = GETPOST("page"); $page = GETPOST("page");
$userid=GETPOST('userid');
$begin=GETPOST('begin');
if (! $sortorder) $sortorder="ASC"; if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="p.name"; if (! $sortfield) $sortfield="p.name";
@ -86,9 +88,9 @@ else if ($type == "o")
if ($view == 'phone') { $text=" (Vue Telephones)"; } if ($view == 'phone') { $text=" (Vue Telephones)"; }
if ($view == 'mail') { $text=" (Vue EMail)"; } if ($view == 'mail') { $text=" (Vue EMail)"; }
if ($view == 'recent') { $text=" (Recents)"; } if ($view == 'recent') { $text=" (Recents)"; }
$titre.= " $text"; if (! empty($text)) $titre.= " $text";
if ($_POST["button_removefilter"]) if (GETPOST('button_removefilter'))
{ {
$search_nom=""; $search_nom="";
$search_prenom=""; $search_prenom="";
@ -129,9 +131,9 @@ if (!$user->rights->societe->client->voir && !$socid) //restriction
{ {
$sql .= " AND (sc.fk_user = " .$user->id." OR p.fk_soc IS NULL)"; $sql .= " AND (sc.fk_user = " .$user->id." OR p.fk_soc IS NULL)";
} }
if ($_GET["userid"]) // propre au commercial if ($userid) // propre au commercial
{ {
$sql .= " AND p.fk_user_creat=".$_GET["userid"]; $sql .= " AND p.fk_user_creat=".$userid;
} }
// Filter to exclude not owned private contacts // Filter to exclude not owned private contacts
@ -205,7 +207,7 @@ if ($sall)
{ {
$sql .= " AND (p.name LIKE '%".$db->escape($sall)."%' OR p.firstname LIKE '%".$db->escape($sall)."%' OR p.email LIKE '%".$db->escape($sall)."%')"; $sql .= " AND (p.name LIKE '%".$db->escape($sall)."%' OR p.firstname LIKE '%".$db->escape($sall)."%' OR p.email LIKE '%".$db->escape($sall)."%')";
} }
if ($socid) if (! empty($socid))
{ {
$sql .= " AND s.rowid = ".$socid; $sql .= " AND s.rowid = ".$socid;
} }
@ -235,8 +237,7 @@ if ($result)
{ {
$contactstatic=new Contact($db); $contactstatic=new Contact($db);
$begin=$_GET["begin"]; $param ='&begin='.urlencode($begin).'&view='.urlencode($view).'&userid='.urlencode($userid).'&contactname='.urlencode($sall);
$param ='&begin='.urlencode($begin).'&view='.urlencode($view).'&userid='.urlencode($_GET["userid"]).'&contactname='.urlencode($sall);
$param.='&type='.urlencode($type).'&view='.urlencode($view).'&search_nom='.urlencode($search_nom).'&search_prenom='.urlencode($search_prenom).'&search_societe='.urlencode($search_societe).'&search_email='.urlencode($search_email); $param.='&type='.urlencode($type).'&view='.urlencode($view).'&search_nom='.urlencode($search_nom).'&search_prenom='.urlencode($search_prenom).'&search_societe='.urlencode($search_societe).'&search_email='.urlencode($search_email);
if ($search_priv == '0' || $search_priv == '1') $param.="&search_priv=".urlencode($search_priv); if ($search_priv == '0' || $search_priv == '1') $param.="&search_priv=".urlencode($search_priv);
@ -408,7 +409,7 @@ if ($result)
print '</form>'; print '</form>';
if ($num > $limit) print_barre_liste('', $page, $_SERVER["PHP_SELF"], '&amp;begin='.$begin.'&amp;view='.$view.'&amp;userid='.$_GET["userid"], $sortfield, $sortorder, '', $num, $nbtotalofrecords, ''); if ($num > $limit) print_barre_liste('', $page, $_SERVER["PHP_SELF"], '&amp;begin='.$begin.'&amp;view='.$view.'&amp;userid='.$userid, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
$db->free($result); $db->free($result);
} }
@ -419,7 +420,7 @@ else
print '<br>'; print '<br>';
$db->close();
llxFooter(); llxFooter();
$db->close();
?> ?>

5
htdocs/contact/perso.php
View File

@ -131,7 +131,7 @@ if ($action == 'edit')
print '</td>'; print '</td>';
print '<td colspan="2">'.$langs->trans("Alert").': '; print '<td colspan="2">'.$langs->trans("Alert").': ';
if ($object->birthday_alert) if (! empty($object->birthday_alert))
{ {
print '<input type="checkbox" name="birthday_alert" checked="checked"></td>'; print '<input type="checkbox" name="birthday_alert" checked="checked"></td>';
} }
@ -193,7 +193,7 @@ else
// Date To Birth // Date To Birth
print '<tr>'; print '<tr>';
if ($object->birthday != '') if (! empty($object->birthday))
{ {
include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');
@ -225,7 +225,6 @@ else
dol_fiche_end(); dol_fiche_end();
if ($action != 'edit') if ($action != 'edit')
{ {
// Barre d'actions // Barre d'actions

12
htdocs/core/class/commonobject.class.php
View File

@ -772,13 +772,13 @@ abstract class CommonObject
$sql = "SELECT MAX(te.".$fieldid.")"; $sql = "SELECT MAX(te.".$fieldid.")";
$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as te"; $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as te";
if ($this->ismultientitymanaged == 2 || ($this->element != 'societe' && empty($this->isnolinkedbythird) && empty($user->rights->societe->client->voir))) $sql.= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2 || ($this->element != 'societe' && empty($this->isnolinkedbythird) && empty($user->rights->societe->client->voir))) $sql.= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity
if (empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc"; if (empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; $sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";
if (empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir) $sql.= " AND sc.fk_user = " .$user->id; if (empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir) $sql.= " AND sc.fk_user = " .$user->id;
if (! empty($filter)) $sql.=" AND ".$filter; if (! empty($filter)) $sql.=" AND ".$filter;
if ($this->ismultientitymanaged == 2 || ($this->element != 'societe' && empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir)) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2 || ($this->element != 'societe' && empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir)) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
if ($this->ismultientitymanaged == 1) $sql.= ' AND te.entity IN ('.getEntity($this->element, 1).')'; if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.= ' AND te.entity IN ('.getEntity($this->element, 1).')';
//print $sql."<br>"; //print $sql."<br>";
$result = $this->db->query($sql); $result = $this->db->query($sql);
@ -793,13 +793,13 @@ abstract class CommonObject
$sql = "SELECT MIN(te.".$fieldid.")"; $sql = "SELECT MIN(te.".$fieldid.")";
$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as te"; $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as te";
if ($this->ismultientitymanaged == 2 || ($this->element != 'societe' && empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir)) $sql.= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2 || ($this->element != 'societe' && empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir)) $sql.= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity
if (empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc"; if (empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; $sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";
if (empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir) $sql.= " AND sc.fk_user = " .$user->id; if (empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir) $sql.= " AND sc.fk_user = " .$user->id;
if (! empty($filter)) $sql.=" AND ".$filter; if (! empty($filter)) $sql.=" AND ".$filter;
if ($this->ismultientitymanaged == 2 || ($this->element != 'societe' && empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir)) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2 || ($this->element != 'societe' && empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir)) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
if ($this->ismultientitymanaged == 1) $sql.= ' AND te.entity IN ('.getEntity($this->element, 1).')'; if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.= ' AND te.entity IN ('.getEntity($this->element, 1).')';
// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null // Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
//print $sql."<br>"; //print $sql."<br>";

17
htdocs/core/class/html.form.class.php
View File

@ -2151,21 +2151,23 @@ class Form
$inputok=array(); $inputok=array();
$inputko=array(); $inputko=array();
if (is_array($formquestion) && count($formquestion) > 0) if (is_array($formquestion) && ! empty($formquestion))
{ {
$more.='<table class="paddingrightonly" width="100%">'."\n"; $more.='<table class="paddingrightonly" width="100%">'."\n";
$more.='<tr><td colspan="3" valign="top">'.$formquestion['text'].'</td></tr>'."\n"; $more.='<tr><td colspan="3" valign="top">'.(! empty($formquestion['text'])?$formquestion['text']:'').'</td></tr>'."\n";
foreach ($formquestion as $key => $input) foreach ($formquestion as $key => $input)
{ {
if (is_array($input)) if (is_array($input) && ! empty($input))
{ {
$size=(! empty($input['size'])?' size="'.$input['size'].'"':'');
if ($input['type'] == 'text') if ($input['type'] == 'text')
{ {
$more.='<tr><td valign="top">'.$input['label'].'</td><td valign="top" colspan="2" align="left"><input type="text" class="flat" id="'.$input['name'].'" name="'.$input['name'].'" size="'.$input['size'].'" value="'.$input['value'].'" /></td></tr>'."\n"; $more.='<tr><td valign="top">'.$input['label'].'</td><td valign="top" colspan="2" align="left"><input type="text" class="flat" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'" /></td></tr>'."\n";
} }
else if ($input['type'] == 'password') else if ($input['type'] == 'password')
{ {
$more.='<tr><td valign="top">'.$input['label'].'</td><td valign="top" colspan="2" align="left"><input type="password" class="flat" id="'.$input['name'].'" name="'.$input['name'].'" size="'.$input['size'].'" value="'.$input['value'].'" /></td></tr>'."\n"; $more.='<tr><td valign="top">'.$input['label'].'</td><td valign="top" colspan="2" align="left"><input type="password" class="flat" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'" /></td></tr>'."\n";
} }
else if ($input['type'] == 'select') else if ($input['type'] == 'select')
{ {
@ -3087,8 +3089,9 @@ class Form
if ($d) if ($d)
{ {
// Show date with popup // Show date with popup
if ($conf->use_javascript_ajax && (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR != "none")) if (! empty($conf->use_javascript_ajax) && (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR != "none"))
{ {
$formated_date='';
//print "e".$set_time." t ".$conf->format_date_short; //print "e".$set_time." t ".$conf->format_date_short;
if (strval($set_time) != '' && $set_time != -1) if (strval($set_time) != '' && $set_time != -1)
{ {
@ -3690,7 +3693,7 @@ class Form
} }
else else
{ {
if ($conf->gravatar->enabled && $email) if (! empty($conf->gravatar->enabled) && $email)
{ {
global $dolibarr_main_url_root; global $dolibarr_main_url_root;
$ret.='<!-- Put link to gravatar -->'; $ret.='<!-- Put link to gravatar -->';

2
htdocs/core/class/html.formfile.class.php
View File

@ -435,7 +435,7 @@ class FormFile
$out.= '</tr>'; $out.= '</tr>';
// Execute hooks // Execute hooks
$parameters=array('socid'=>$GLOBALS['socid'],'id'=>$GLOBALS['id'],'modulepart'=>$modulepart); $parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart);
if (is_object($hookmanager)) $out.= $hookmanager->executeHooks('formBuilddocOptions',$parameters,$GLOBALS['object']); if (is_object($hookmanager)) $out.= $hookmanager->executeHooks('formBuilddocOptions',$parameters,$GLOBALS['object']);
} }

50
htdocs/core/class/html.formmail.class.php
View File

@ -1,6 +1,6 @@
<?PHP <?PHP
/* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2005-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) 2010-2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -245,7 +245,7 @@ class FormMail
$out.= '<table class="border" width="100%">'."\n"; $out.= '<table class="border" width="100%">'."\n";
// Substitution array // Substitution array
if ($this->withsubstit) if (! empty($this->withsubstit))
{ {
$out.= '<tr><td colspan="2">'; $out.= '<tr><td colspan="2">';
$help=""; $help="";
@ -258,9 +258,9 @@ class FormMail
} }
// From // From
if ($this->withfrom) if (! empty($this->withfrom))
{ {
if ($this->withfromreadonly) if (! empty($this->withfromreadonly))
{ {
$out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />'; $out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
$out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />'; $out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
@ -302,7 +302,7 @@ class FormMail
} }
// Replyto // Replyto
if ($this->withreplyto) if (! empty($this->withreplyto))
{ {
if ($this->withreplytoreadonly) if ($this->withreplytoreadonly)
{ {
@ -314,7 +314,7 @@ class FormMail
} }
// Errorsto // Errorsto
if ($this->witherrorsto) if (! empty($this->witherrorsto))
{ {
//if (! $this->errorstomail) $this->errorstomail=$this->frommail; //if (! $this->errorstomail) $this->errorstomail=$this->frommail;
$errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail); $errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
@ -334,7 +334,7 @@ class FormMail
} }
// To // To
if ($this->withto || is_array($this->withto)) if (! empty($this->withto) || is_array($this->withto))
{ {
$out.= '<tr><td width="180">'; $out.= '<tr><td width="180">';
if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients")); if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
@ -375,16 +375,16 @@ class FormMail
} }
else else
{ {
if ($this->withtofree) if (! empty($this->withtofree))
{ {
$out.= '<input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />'; $out.= '<input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
} }
if (is_array($this->withto)) if (! empty($this->withto) && is_array($this->withto))
{ {
if ($this->withtofree) $out.= " ".$langs->trans("or")." "; if (! empty($this->withtofree)) $out.= " ".$langs->trans("or")." ";
$out.= $form->selectarray("receiver", $this->withto, GETPOST("receiver"), 1); $out.= $form->selectarray("receiver", $this->withto, GETPOST("receiver"), 1);
} }
if ($this->withtosocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method. if (isset($this->withtosocid) && $this->withtosocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
{ {
$liste=array(); $liste=array();
$soc=new Societe($this->db); $soc=new Societe($this->db);
@ -401,7 +401,7 @@ class FormMail
} }
// CC // CC
if ($this->withtocc || is_array($this->withtocc)) if (! empty($this->withtocc) || is_array($this->withtocc))
{ {
$out.= '<tr><td width="180">'; $out.= '<tr><td width="180">';
$out.= $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients")); $out.= $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
@ -413,12 +413,12 @@ class FormMail
else else
{ {
$out.= '<input size="'.(is_array($this->withtocc)?"30":"60").'" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />'; $out.= '<input size="'.(is_array($this->withtocc)?"30":"60").'" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
if (is_array($this->withto)) if (! empty($this->withto) && is_array($this->withto))
{ {
$out.= " ".$langs->trans("or")." "; $out.= " ".$langs->trans("or")." ";
$out.= $form->selectarray("receivercc", $this->withto, GETPOST("receivercc"), 1); $out.= $form->selectarray("receivercc", $this->withto, GETPOST("receivercc"), 1);
} }
if ($this->withtoccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method. if (! empty($this->withtoccsocid) && $this->withtoccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
{ {
$liste=array(); $liste=array();
$soc=new Societe($this->db); $soc=new Societe($this->db);
@ -435,24 +435,24 @@ class FormMail
} }
// CCC // CCC
if ($this->withtoccc || is_array($this->withtoccc)) if (! empty($this->withtoccc) || is_array($this->withtoccc))
{ {
$out.= '<tr><td width="180">'; $out.= '<tr><td width="180">';
$out.= $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients")); $out.= $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
$out.= '</td><td>'; $out.= '</td><td>';
if ($this->withtocccreadonly) if (! empty($this->withtocccreadonly))
{ {
$out.= (! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))?$this->withtoccc:""; $out.= (! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))?$this->withtoccc:"";
} }
else else
{ {
$out.= '<input size="'.(is_array($this->withtoccc)?"30":"60").'" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />'; $out.= '<input size="'.(is_array($this->withtoccc)?"30":"60").'" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />';
if (is_array($this->withto)) if (! empty($this->withto) && is_array($this->withto))
{ {
$out.= " ".$langs->trans("or")." "; $out.= " ".$langs->trans("or")." ";
$out.= $form->selectarray("receiverccc", $this->withto, GETPOST("receiverccc"), 1); $out.= $form->selectarray("receiverccc", $this->withto, GETPOST("receiverccc"), 1);
} }
if ($this->withtocccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method. if (! empty($this->withtocccsocid) && $this->withtocccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
{ {
$liste=array(); $liste=array();
$soc=new Societe($this->db); $soc=new Societe($this->db);
@ -470,11 +470,11 @@ class FormMail
} }
// Ask delivery receipt // Ask delivery receipt
if ($this->withdeliveryreceipt) if (! empty($this->withdeliveryreceipt))
{ {
$out.= '<tr><td width="180">'.$langs->trans("DeliveryReceipt").'</td><td>'; $out.= '<tr><td width="180">'.$langs->trans("DeliveryReceipt").'</td><td>';
if ($this->withdeliveryreceiptreadonly) if (! empty($this->withdeliveryreceiptreadonly))
{ {
$out.= yn($this->withdeliveryreceipt); $out.= yn($this->withdeliveryreceipt);
} }
@ -487,7 +487,7 @@ class FormMail
} }
// Topic // Topic
if ($this->withtopic) if (! empty($this->withtopic))
{ {
$this->withtopic=make_substitutions($this->withtopic,$this->substit); $this->withtopic=make_substitutions($this->withtopic,$this->substit);
@ -507,7 +507,7 @@ class FormMail
} }
// Attached files // Attached files
if ($this->withfile) if (! empty($this->withfile))
{ {
$out.= '<tr>'; $out.= '<tr>';
$out.= '<td width="180">'.$langs->trans("MailFile").'</td>'; $out.= '<td width="180">'.$langs->trans("MailFile").'</td>';
@ -549,7 +549,7 @@ class FormMail
} }
// Message // Message
if ($this->withbody) if (! empty($this->withbody))
{ {
$defaultmessage=""; $defaultmessage="";
@ -617,7 +617,7 @@ class FormMail
$out.= "</td></tr>\n"; $out.= "</td></tr>\n";
} }
if ($this->withform) if (! empty($this->withform))
{ {
$out.= '<tr><td align="center" colspan="2"><center>'; $out.= '<tr><td align="center" colspan="2"><center>';
$out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"'; $out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
@ -637,7 +637,7 @@ class FormMail
$out.= '</table>'."\n"; $out.= '</table>'."\n";
if ($this->withform) $out.= '</form>'."\n"; if (! empty($this->withform)) $out.= '</form>'."\n";
$out.= "<!-- Fin form mail -->\n"; $out.= "<!-- Fin form mail -->\n";
return $out; return $out;

6
htdocs/core/lib/ajax.lib.php
View File

@ -207,19 +207,19 @@ function ajax_dialog($title,$message,$w=350,$h=150)
*/ */
function ajax_combobox($htmlname, $event=array()) function ajax_combobox($htmlname, $event=array())
{ {
$msg.= '<script type="text/javascript"> $msg = '<script type="text/javascript">
$(function() { $(function() {
$("#'.$htmlname.'").combobox({ $("#'.$htmlname.'").combobox({
selected : function(event,ui) { selected : function(event,ui) {
var obj = '.json_encode($event).'; var obj = '.json_encode($event).';
$.each(obj, function(key,values) { $.each(obj, function(key,values) {
if (values.method.length) { if (values.method.length) {
getMethod(values); getMethod(values);
} }
}); });
} }
}); });
function getMethod(obj) { function getMethod(obj) {
var id = $("#'.$htmlname.'").val(); var id = $("#'.$htmlname.'").val();
var method = obj.method; var method = obj.method;

90
htdocs/core/lib/company.lib.php
View File

@ -1,8 +1,8 @@
<?php <?php
/* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com> * Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2010-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
@ -909,11 +909,23 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$histo[$numaction]=array('type'=>'action','id'=>$obj->id,'datestart'=>$db->jdate($obj->dp),'date'=>$db->jdate($obj->dp2),'note'=>$obj->label,'percent'=>$obj->percent, $histo[$numaction]=array(
'acode'=>$obj->acode,'libelle'=>$obj->libelle, 'type'=>'action',
'userid'=>$obj->user_id,'login'=>$obj->login, 'id'=>$obj->id,
'contact_id'=>$obj->fk_contact,'name'=>$obj->name,'firstname'=>$obj->firstname, 'datestart'=>$db->jdate($obj->dp),
'fk_element'=>$obj->fk_element,'elementtype'=>$obj->elementtype); 'date'=>$db->jdate($obj->dp2),
'note'=>$obj->label,
'percent'=>$obj->percent,
'acode'=>$obj->acode,
'libelle'=>$obj->libelle,
'userid'=>$obj->user_id,
'login'=>$obj->login,
'contact_id'=>$obj->fk_contact,
'name'=>$obj->name,
'firstname'=>$obj->firstname,
'fk_element'=>$obj->fk_element,
'elementtype'=>$obj->elementtype
);
$numaction++; $numaction++;
$i++; $i++;
} }
@ -924,7 +936,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
} }
} }
if ($conf->mailing->enabled && ! empty($objcon->email)) if (! empty($conf->mailing->enabled) && ! empty($objcon->email))
{ {
$langs->load("mails"); $langs->load("mails");
@ -949,10 +961,16 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$histo[$numaction]=array('type'=>'mailing','id'=>$obj->id,'date'=>$db->jdate($obj->da),'note'=>$obj->note,'percent'=>$obj->percentage, $histo[$numaction]=array(
'acode'=>$obj->acode,'libelle'=>$obj->libelle, 'type'=>'mailing',
'userid'=>$obj->user_id,'login'=>$obj->login, 'id'=>$obj->id,
'contact_id'=>$obj->contact_id); 'date'=>$db->jdate($obj->da),
'note'=>$obj->note,
'percent'=>$obj->percentage,
'acode'=>$obj->acode,
'userid'=>$obj->user_id,
'login'=>$obj->login
);
$numaction++; $numaction++;
$i++; $i++;
} }
@ -1018,7 +1036,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
// Action // Action
$out.='<td>'; $out.='<td>';
if ($histo[$key]['type']=='action') if (isset($histo[$key]['type']) && $histo[$key]['type']=='action')
{ {
$actionstatic->type_code=$histo[$key]['acode']; $actionstatic->type_code=$histo[$key]['acode'];
$transcode=$langs->trans("Action".$histo[$key]['acode']); $transcode=$langs->trans("Action".$histo[$key]['acode']);
@ -1028,7 +1046,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
$actionstatic->id=$histo[$key]['id']; $actionstatic->id=$histo[$key]['id'];
$out.=$actionstatic->getNomUrl(1,40); $out.=$actionstatic->getNomUrl(1,40);
} }
if ($histo[$key]['type']=='mailing') if (isset($histo[$key]['type']) && $histo[$key]['type']=='mailing')
{ {
$out.='<a href="'.DOL_URL_ROOT.'/comm/mailing/fiche.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"),"email").' '; $out.='<a href="'.DOL_URL_ROOT.'/comm/mailing/fiche.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"),"email").' ';
$transcode=$langs->trans("Action".$histo[$key]['acode']); $transcode=$langs->trans("Action".$histo[$key]['acode']);
@ -1043,30 +1061,34 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
// Objet lie // Objet lie
// TODO uniformize // TODO uniformize
$out.='<td>'; $out.='<td>';
if ($histo[$key]['elementtype'] == 'propal' && $conf->propal->enabled) if (isset($histo[$key]['elementtype']))
{ {
$propalstatic->ref=$langs->trans("ProposalShort"); if ($histo[$key]['elementtype'] == 'propal' && ! empty($conf->propal->enabled))
$propalstatic->id=$histo[$key]['fk_element']; {
$out.=$propalstatic->getNomUrl(1); $propalstatic->ref=$langs->trans("ProposalShort");
} $propalstatic->id=$histo[$key]['fk_element'];
elseif ($histo[$key]['elementtype'] == 'commande' && $conf->commande->enabled) $out.=$propalstatic->getNomUrl(1);
{ }
$orderstatic->ref=$langs->trans("Order"); elseif ($histo[$key]['elementtype'] == 'commande' && ! empty($conf->commande->enabled))
$orderstatic->id=$histo[$key]['fk_element']; {
$out.=$orderstatic->getNomUrl(1); $orderstatic->ref=$langs->trans("Order");
} $orderstatic->id=$histo[$key]['fk_element'];
elseif ($histo[$key]['elementtype'] == 'facture' && $conf->facture->enabled) $out.=$orderstatic->getNomUrl(1);
{ }
$facturestatic->ref=$langs->trans("Invoice"); elseif ($histo[$key]['elementtype'] == 'facture' && ! empty($conf->facture->enabled))
$facturestatic->id=$histo[$key]['fk_element']; {
$facturestatic->type=$histo[$key]['ftype']; $facturestatic->ref=$langs->trans("Invoice");
$out.=$facturestatic->getNomUrl(1,'compta'); $facturestatic->id=$histo[$key]['fk_element'];
$facturestatic->type=$histo[$key]['ftype'];
$out.=$facturestatic->getNomUrl(1,'compta');
}
else $out.='&nbsp;';
} }
else $out.='&nbsp;'; else $out.='&nbsp;';
$out.='</td>'; $out.='</td>';
// Contact pour cette action // Contact pour cette action
if (! $objcon->id && $histo[$key]['contact_id'] > 0) if (! empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
{ {
$contactstatic->name=$histo[$key]['name']; $contactstatic->name=$histo[$key]['name'];
$contactstatic->firstname=$histo[$key]['firstname']; $contactstatic->firstname=$histo[$key]['firstname'];

6
htdocs/core/lib/contact.lib.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2010-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
@ -40,7 +40,7 @@ function contact_prepare_head($object)
$head[$h][2] = 'card'; $head[$h][2] = 'card';
$h++; $h++;
if ($conf->ldap->enabled && $conf->global->LDAP_CONTACT_ACTIVE) if (! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
{ {
$langs->load("ldap"); $langs->load("ldap");

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

@ -865,7 +865,7 @@ function dol_meta_create($object)
{ {
//Pour les articles //Pour les articles
$meta .= "ITEM_" . $i . "_QUANTITY=\"" . $object->lines[$i]->qty . "\" $meta .= "ITEM_" . $i . "_QUANTITY=\"" . $object->lines[$i]->qty . "\"
ITEM_" . $i . "_UNIT_PRICE=\"" . $object->lines[$i]->price . "\" ITEM_" . $i . "_UNIT_PRICE=\"" . $object->lines[$i]->total_ht . "\"
ITEM_" . $i . "_TVA=\"" .$object->lines[$i]->tva_tx . "\" ITEM_" . $i . "_TVA=\"" .$object->lines[$i]->tva_tx . "\"
ITEM_" . $i . "_DESCRIPTION=\"" . str_replace("\r\n","",nl2br($object->lines[$i]->desc)) . "\" ITEM_" . $i . "_DESCRIPTION=\"" . str_replace("\r\n","",nl2br($object->lines[$i]->desc)) . "\"
"; ";

27
htdocs/core/lib/functions.lib.php
View File

@ -1177,19 +1177,22 @@ function dol_print_phone($phone,$country="FR",$cid=0,$socid=0,$addlink=0,$separ=
if (! empty($addlink)) if (! empty($addlink))
{ {
if ($conf->clicktodial->enabled) if (! empty($conf->clicktodial->enabled))
{ {
if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial(); if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();
if (empty($conf->global->CLICKTODIAL_URL)) $urlmask='ErrorClickToDialModuleNotConfigured'; if (empty($conf->global->CLICKTODIAL_URL)) $urlmask='ErrorClickToDialModuleNotConfigured';
else $urlmask=$conf->global->CLICKTODIAL_URL; else $urlmask=$conf->global->CLICKTODIAL_URL;
$clicktodial_poste=(! empty($user->clicktodial_poste)?urlencode($user->clicktodial_poste):'');
$clicktodial_login=(! empty($user->clicktodial_login)?urlencode($user->clicktodial_login):'');
$clicktodial_password=(! empty($user->clicktodial_password)?urlencode($user->clicktodial_password):'');
// This line is for backward compatibility // This line is for backward compatibility
$url = sprintf($urlmask, urlencode($phone), urlencode($user->clicktodial_poste), urlencode($user->clicktodial_login), urlencode($user->clicktodial_password)); $url = sprintf($urlmask, urlencode($phone), $clicktodial_poste, $clicktodial_login, $clicktodial_password);
// Thoose lines are for substitution // Thoose lines are for substitution
$substitarray=array('__PHONEFROM__'=>urlencode($user->clicktodial_poste), $substitarray=array('__PHONEFROM__'=>$clicktodial_poste,
'__PHONETO__'=>urlencode($phone), '__PHONETO__'=>urlencode($phone),
'__LOGIN__'=>urlencode($user->clicktodial_login), '__LOGIN__'=>$clicktodial_login,
'__PASS__'=>urlencode($user->clicktodial_password)); '__PASS__'=>$clicktodial_password);
$url = make_substitutions($url, $substitarray); $url = make_substitutions($url, $substitarray);
$newphonesav=$newphone; $newphonesav=$newphone;
$newphone ='<a href="'.$url.'"'; $newphone ='<a href="'.$url.'"';
@ -1292,12 +1295,12 @@ function dol_print_address($address, $htmlid, $mode, $id)
{ {
print nl2br($address); print nl2br($address);
$showgmap=$showomap=0; $showgmap=$showomap=0;
if ($mode=='thirdparty' && $conf->google->enabled && $conf->global->GOOGLE_ENABLE_GMAPS) $showgmap=1; if ($mode=='thirdparty' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS)) $showgmap=1;
if ($mode=='contact' && $conf->google->enabled && $conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS) $showgmap=1; if ($mode=='contact' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) $showgmap=1;
if ($mode=='member' && $conf->google->enabled && $conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS) $showgmap=1; if ($mode=='member' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) $showgmap=1;
if ($mode=='thirdparty' && $conf->openstreetmap->enabled && $conf->global->OPENSTREETMAP_ENABLE_MAPS) $showomap=1; if ($mode=='thirdparty' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) $showomap=1;
if ($mode=='contact' && $conf->openstreetmap->enabled && $conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS) $showomap=1; if ($mode=='contact' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) $showomap=1;
if ($mode=='member' && $conf->openstreetmap->enabled && $conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS) $showomap=1; if ($mode=='member' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) $showomap=1;
// TODO Add a hook here // TODO Add a hook here
if ($showgmap) if ($showgmap)
@ -4024,7 +4027,7 @@ function getCurrencySymbol($currency_code)
$form->load_cache_currencies(); $form->load_cache_currencies();
if (function_exists("mb_convert_encoding") && is_array($form->cache_currencies[$currency_code]['unicode']) && ! empty($form->cache_currencies[$currency_code]['unicode'])) if (function_exists("mb_convert_encoding") && isset($form->cache_currencies[$currency_code]) && is_array($form->cache_currencies[$currency_code]['unicode']) && ! empty($form->cache_currencies[$currency_code]['unicode']))
{ {
foreach($form->cache_currencies[$currency_code]['unicode'] as $unicode) foreach($form->cache_currencies[$currency_code]['unicode'] as $unicode)
{ {

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

@ -531,7 +531,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
// Extract value for mask counter, mask raz and mask offset // Extract value for mask counter, mask raz and mask offset
if (! preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg)) return 'ErrorBadMask'; if (! preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg)) return 'ErrorBadMask';
$masktri=$reg[1].$reg[2].$reg[3]; $masktri=$reg[1].(! empty($reg[2])?$reg[2]:'').(! empty($reg[3])?$reg[3]:'');
$maskcounter=$reg[1]; $maskcounter=$reg[1];
$maskraz=-1; $maskraz=-1;
$maskoffset=0; $maskoffset=0;
@ -558,7 +558,11 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
$masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));//get n first characters of client code where n is length in mask $masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));//get n first characters of client code where n is length in mask
$masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT); $masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);
} }
else $masktype=''; else
{
$masktype='';
$masktype_value='';
}
$maskwithonlyymcode=$mask; $maskwithonlyymcode=$mask;
$maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$maskcounter,$maskwithonlyymcode); $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$maskcounter,$maskwithonlyymcode);

32
htdocs/core/lib/pdf.lib.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com> * Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* Copyright (C) 2010-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2010-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr> * Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
* *
@ -90,7 +90,7 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
//$metric=$arrayformat['unit']; //$metric=$arrayformat['unit'];
// Protection et encryption du pdf // Protection et encryption du pdf
if ($conf->global->PDF_SECURITY_ENCRYPTION) if (! empty($conf->global->PDF_SECURITY_ENCRYPTION))
{ {
/* Permission supported by TCPDF /* Permission supported by TCPDF
- print : Print the document; - print : Print the document;
@ -211,8 +211,8 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target
if ($mode == 'target' && ! is_object($targetcompany)) return -1; if ($mode == 'target' && ! is_object($targetcompany)) return -1;
if ($mode == 'delivery' && ! is_object($deliverycompany)) return -1; if ($mode == 'delivery' && ! is_object($deliverycompany)) return -1;
if ($sourcecompany->state_id && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id); if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id);
if ($targetcompany->state_id && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id); if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id);
if ($mode == 'source') if ($mode == 'source')
{ {
@ -659,7 +659,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
$nbofline=dol_nboflines_bis($line,0,$outputlangs->charset_output); $nbofline=dol_nboflines_bis($line,0,$outputlangs->charset_output);
//print 'nbofline='.$nbofline; exit; //print 'nbofline='.$nbofline; exit;
//print 'e'.$line.'t'.dol_nboflines($line);exit; //print 'e'.$line.'t'.dol_nboflines($line);exit;
$posy=$marge_basse + ($nbofline*3) + ($line1?3:0) + ($line2?3:0) + ($line3?3:0) + ($line4?3:0); $posy=$marge_basse + ($nbofline*3) + (! empty($line1)?3:0) + (! empty($line2)?3:0) + (! empty($line3)?3:0) + (! empty($line4)?3:0);
if ($line) // Free text if ($line) // Free text
{ {
@ -674,7 +674,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
$pdf->line($marge_gauche, $page_hauteur-$posy, 200, $page_hauteur-$posy); $pdf->line($marge_gauche, $page_hauteur-$posy, 200, $page_hauteur-$posy);
$posy--; $posy--;
if ($line1) if (! empty($line1))
{ {
$pdf->SetFont('','B',7); $pdf->SetFont('','B',7);
$pdf->SetXY($marge_gauche,-$posy); $pdf->SetXY($marge_gauche,-$posy);
@ -683,7 +683,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
$pdf->SetFont('','',7); $pdf->SetFont('','',7);
} }
if ($line2) if (! empty($line2))
{ {
$pdf->SetFont('','B',7); $pdf->SetFont('','B',7);
$pdf->SetXY($marge_gauche,-$posy); $pdf->SetXY($marge_gauche,-$posy);
@ -692,13 +692,13 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
$pdf->SetFont('','',7); $pdf->SetFont('','',7);
} }
if ($line3) if (! empty($line3))
{ {
$pdf->SetXY($marge_gauche,-$posy); $pdf->SetXY($marge_gauche,-$posy);
$pdf->MultiCell(200, 2, $line3, 0, 'C', 0); $pdf->MultiCell(200, 2, $line3, 0, 'C', 0);
} }
if ($line4) if (! empty($line4))
{ {
$posy-=3; $posy-=3;
$pdf->SetXY($marge_gauche,-$posy); $pdf->SetXY($marge_gauche,-$posy);
@ -807,11 +807,11 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
{ {
global $db, $conf, $langs; global $db, $conf, $langs;
$idprod=$object->lines[$i]->fk_product; $idprod=(! empty($object->lines[$i]->fk_product)?$object->lines[$i]->fk_product:false);
$label=$object->lines[$i]->label; if (empty($label)) $label=$object->lines[$i]->libelle; $label=(! empty($object->lines[$i]->label)?$object->lines[$i]->label:(! empty($object->lines[$i]->libelle)?$object->lines[$i]->libelle:''));
$desc=$object->lines[$i]->desc; if (empty($desc)) $desc=$object->lines[$i]->description; $desc=(! empty($object->lines[$i]->desc)?$object->lines[$i]->desc:(! empty($object->lines[$i]->description)?$object->lines[$i]->description:''));
$ref_supplier=$object->lines[$i]->ref_supplier; if (empty($ref_supplier)) $ref_supplier=$object->lines[$i]->ref_fourn; // TODO Not yet saved for supplier invoices, only supplier orders $ref_supplier=(! empty($object->lines[$i]->ref_supplier)?$object->lines[$i]->ref_supplier:(! empty($object->lines[$i]->ref_fourn)?$object->lines[$i]->ref_fourn:'')); // TODO Not yet saved for supplier invoices, only supplier orders
$note=$object->lines[$i]->note; $note=(! empty($object->lines[$i]->note)?$object->lines[$i]->note:'');
if ($issupplierline) $prodser = new ProductFournisseur($db); if ($issupplierline) $prodser = new ProductFournisseur($db);
else $prodser = new Product($db); else $prodser = new Product($db);
@ -874,7 +874,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
{ {
$prefix_prodserv = ""; $prefix_prodserv = "";
$ref_prodserv = ""; $ref_prodserv = "";
if ($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS) // In standard mode, we do not show this if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) // In standard mode, we do not show this
{ {
if ($prodser->isservice()) if ($prodser->isservice())
{ {
@ -898,7 +898,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
} }
} }
if ($object->lines[$i]->date_start || $object->lines[$i]->date_end) if (! empty($object->lines[$i]->date_start) || ! empty($object->lines[$i]->date_end))
{ {
$format='day'; $format='day';
// Show duration if exists // Show duration if exists

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

@ -49,7 +49,7 @@ function user_prepare_head($object)
$head[$h][2] = 'user'; $head[$h][2] = 'user';
$h++; $h++;
if ($conf->ldap->enabled && $conf->global->LDAP_SYNCHRO_ACTIVE) if (! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
{ {
$langs->load("ldap"); $langs->load("ldap");
$head[$h][0] = DOL_URL_ROOT.'/user/ldap.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/user/ldap.php?id='.$object->id;
@ -71,7 +71,7 @@ function user_prepare_head($object)
$head[$h][2] = 'guisetup'; $head[$h][2] = 'guisetup';
$h++; $h++;
if ($conf->clicktodial->enabled) if (! empty($conf->clicktodial->enabled))
{ {
$head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id;
$head[$h][1] = $langs->trans("ClickToDial"); $head[$h][1] = $langs->trans("ClickToDial");
@ -85,7 +85,7 @@ function user_prepare_head($object)
// $this->tabs = array('entity:-tabname:Title:@mymodule:conditiontoshow:/mymodule/mypage.php?id=__ID__'); to remove a tab // $this->tabs = array('entity:-tabname:Title:@mymodule:conditiontoshow:/mymodule/mypage.php?id=__ID__'); to remove a tab
complete_head_from_modules($conf,$langs,$object,$head,$h,'user'); complete_head_from_modules($conf,$langs,$object,$head,$h,'user');
if (! $user->societe_id) if (! empty($user->societe_id))
{ {
$head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
$head[$h][1] = $langs->trans("Note"); $head[$h][1] = $langs->trans("Note");
@ -120,7 +120,7 @@ function group_prepare_head($object)
$head[$h][2] = 'group'; $head[$h][2] = 'group';
$h++; $h++;
if ($conf->ldap->enabled && $conf->global->LDAP_SYNCHRO_ACTIVE) if (! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
{ {
$langs->load("ldap"); $langs->load("ldap");
$head[$h][0] = DOL_URL_ROOT.'/user/group/ldap.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/user/group/ldap.php?id='.$object->id;
@ -166,7 +166,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
} }
$selected_theme=$conf->global->MAIN_THEME; $selected_theme=$conf->global->MAIN_THEME;
if (! empty($fuser)) $selected_theme=$fuser->conf->MAIN_THEME; if (! empty($fuser->conf->MAIN_THEME)) $selected_theme=$fuser->conf->MAIN_THEME;
$colspan=2; $colspan=2;
if ($foruserprofile) $colspan=4; if ($foruserprofile) $colspan=4;

2
htdocs/core/modules/DolibarrModules.class.php
View File

@ -900,7 +900,7 @@ abstract class DolibarrModules
if ($resql) if ($resql)
{ {
$obj=$this->db->fetch_object($resql); $obj=$this->db->fetch_object($resql);
if ($obj->value) if (! empty($obj->value) && ! empty($this->rights))
{ {
// Si module actif // Si module actif
foreach ($this->rights as $key => $value) foreach ($this->rights as $key => $value)

2
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -627,7 +627,7 @@ class pdf_einstein extends ModelePDFCommandes
$this->atleastoneratenotnull=0; $this->atleastoneratenotnull=0;
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
{ {
$tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && $this->tva['0.000'] == (float) 0) ? true : false); $tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && is_float($this->tva['0.000'])) ? true : false);
if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull) if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull)
{ {
// Nothing to do // Nothing to do

18
htdocs/core/modules/dons/html_cerfafr.modules.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2006 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 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
@ -51,7 +52,7 @@ class html_cerfafr extends ModeleDon
/** /**
* Return if a module can be used or not * Return if a module can be used or not
* *
* @return boolean true if module can be used * @return boolean true if module can be used
*/ */
function isEnabled() function isEnabled()
@ -62,7 +63,7 @@ class html_cerfafr extends ModeleDon
/** /**
* Write the object to document file to disk * Write the object to document file to disk
* *
* @param Don $don Donation object * @param Don $don Donation object
* @param Translate $outputlangs Lang object for output language * @param Translate $outputlangs Lang object for output language
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
@ -72,6 +73,7 @@ class html_cerfafr extends ModeleDon
global $user,$conf,$langs,$mysoc; global $user,$conf,$langs,$mysoc;
$now=dol_now(); $now=dol_now();
$id = (! is_object($don)?$don:'');
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
@ -81,18 +83,18 @@ class html_cerfafr extends ModeleDon
$outputlangs->load("bills"); $outputlangs->load("bills");
$outputlangs->load("products"); $outputlangs->load("products");
if ($conf->don->dir_output) if (! empty($conf->don->dir_output))
{ {
// Definition de l'objet $don (pour compatibilite ascendante) // Definition de l'objet $don (pour compatibilite ascendante)
if (! is_object($don)) if (! is_object($don))
{ {
$id = $don;
$don = new Don($this->db); $don = new Don($this->db);
$ret=$don->fetch($id); $ret=$don->fetch($id);
$id=$don->id;
} }
// Definition de $dir et $file // Definition de $dir et $file
if ($don->specimen) if (! empty($don->specimen))
{ {
$dir = $conf->don->dir_output; $dir = $conf->don->dir_output;
$file = $dir . "/SPECIMEN.html"; $file = $dir . "/SPECIMEN.html";
@ -120,7 +122,7 @@ class html_cerfafr extends ModeleDon
$form = implode('', file($donmodel)); $form = implode('', file($donmodel));
$form = str_replace('__REF__',$id,$form); $form = str_replace('__REF__',$id,$form);
$form = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$form); $form = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$form);
$form = str_replace('__IP__',$user->ip,$form); //$form = str_replace('__IP__',$user->ip,$form); // TODO $user->ip not exist
$form = str_replace('__AMOUNT__',$don->amount,$form); $form = str_replace('__AMOUNT__',$don->amount,$form);
$form = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$conf->currency),$form); $form = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$conf->currency),$form);
$form = str_replace('__CURRENCYCODE__',$conf->currency,$form); $form = str_replace('__CURRENCYCODE__',$conf->currency,$form);

12
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -315,6 +315,9 @@ class pdf_crabe extends ModelePDFFactures
$localtax2rate=(string) $object->lines[$i]->localtax2_tx; $localtax2rate=(string) $object->lines[$i]->localtax2_tx;
if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*'; if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]='';
if (! isset($this->localtax1[$localtax1rate])) $this->localtax1[$localtax1rate]='';
if (! isset($this->localtax2[$localtax2rate])) $this->localtax2[$localtax2rate]='';
$this->tva[$vatrate] += $tvaligne; $this->tva[$vatrate] += $tvaligne;
$this->localtax1[$localtax1rate]+=$localtax1ligne; $this->localtax1[$localtax1rate]+=$localtax1ligne;
$this->localtax2[$localtax2rate]+=$localtax2ligne; $this->localtax2[$localtax2rate]+=$localtax2ligne;
@ -735,7 +738,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top + 0);
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1); $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
$pdf->SetXY($col2x, $tab2_top + 0); $pdf->SetXY($col2x, $tab2_top + 0);
$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($object->total_ht + $object->remise)), 0, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($object->total_ht + (! empty($object->remise)?$object->remise:0))), 0, 'R', 1);
// Show VAT by rates and total // Show VAT by rates and total
$pdf->SetFillColor(248,248,248); $pdf->SetFillColor(248,248,248);
@ -743,7 +746,8 @@ class pdf_crabe extends ModelePDFFactures
$this->atleastoneratenotnull=0; $this->atleastoneratenotnull=0;
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
{ {
$tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && $this->tva['0.000'] == (float) 0) ? true : false);
$tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && is_float($this->tva['0.000'])) ? true : false);
if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull) if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull)
{ {
// Nothing to do // Nothing to do
@ -1179,7 +1183,7 @@ class pdf_crabe extends ModelePDFFactures
if (! empty($usecontact)) if (! empty($usecontact))
{ {
// On peut utiliser le nom de la societe du contact // On peut utiliser le nom de la societe du contact
if ($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) $socname = $object->contact->socname; if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
else $socname = $object->client->nom; else $socname = $object->client->nom;
$carac_client_name=$outputlangs->convToOutputCharset($socname); $carac_client_name=$outputlangs->convToOutputCharset($socname);
} }
@ -1188,7 +1192,7 @@ class pdf_crabe extends ModelePDFFactures
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
} }
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target'); $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
// Show recipient // Show recipient
$posy=42; $posy=42;

2
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -640,7 +640,7 @@ class pdf_azur extends ModelePDFPropales
$this->atleastoneratenotnull=0; $this->atleastoneratenotnull=0;
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
{ {
$tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && $this->tva['0.000'] == (float) 0) ? true : false); $tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && is_float($this->tva['0.000'])) ? true : false);
if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull) if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull)
{ {
// Nothing to do // Nothing to do

2
htdocs/core/tpl/ajaxrow.tpl.php
View File

@ -19,7 +19,7 @@
?> ?>
<!-- BEGIN PHP TEMPLATE FOR JQUERY --> <!-- BEGIN PHP TEMPLATE FOR JQUERY -->
<?php if (count($object->lines) > 1 && $_GET['action'] != 'editline') { ?> <?php if (count($object->lines) > 1 && GETPOST('action') != 'editline') { ?>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$(".imgup").hide(); $(".imgup").hide();

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

@ -147,6 +147,9 @@ insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (
-- Region US (id country=11) -- Region US (id country=11)
INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1101, 11, 1101, '', 0, 'United-States', 1); INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1101, 11, 1101, '', 0, 'United-States', 1);
-- Region Canada (id country=14)
INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1401, 14, 1401, '', 0, 'Canada', 1);
-- Regions The Netherlands (id country=17) -- Regions The Netherlands (id country=17)
INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1701, 17, 1701, '', 0,'Provincies van Nederland ', 1); INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1701, 17, 1701, '', 0,'Provincies van Nederland ', 1);

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

@ -271,6 +271,18 @@ insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,no
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'WA' ,'',1,'','Western Australia'); insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'WA' ,'',1,'','Western Australia');
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'NT' ,'',1,'','Northern Territory'); insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'NT' ,'',1,'','Northern Territory');
-- Provinces Canada (id country=14)
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (1401,'ON','',1,'','Ontario');
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (1401,'QC','',1,'','Quebec');
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (1401,'NS','',1,'','Nova Scotia');
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (1401,'NB','',1,'','New Brunswick');
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (1401,'MB','',1,'','Manitoba');
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (1401,'BC','',1,'','British Columbia');
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (1401,'PE','',1,'','Prince Edward Island');
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (1401,'SK','',1,'','Saskatchewan');
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (1401,'AB','',1,'','Alberta');
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (1401,'NL','',1,'','Newfoundland and Labrador');
-- Provinces Spain (id country=4) -- Provinces Spain (id country=4)
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('01', 419, '', 19, 'PAIS VASCO', 'País Vasco', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('01', 419, '', 19, 'PAIS VASCO', 'País Vasco', 1);
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('02', 404, '', 4, 'ALBACETE', 'Albacete', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('02', 404, '', 4, 'ALBACETE', 'Albacete', 1);

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

@ -636,16 +636,16 @@ DelayBeforeWarning=قبل التحذير من التأخير
DelaysBeforeWarning=محذرا من التأخير قبل DelaysBeforeWarning=محذرا من التأخير قبل
DelaysOfToleranceBeforeWarning=محذرا من التأخير قبل التسامح DelaysOfToleranceBeforeWarning=محذرا من التأخير قبل التسامح
DelaysOfToleranceDesc=تتيح لك هذه الشاشة لتحديد التأخير قبل السماح تنبيه يقال على الشاشة مع picto ٪ ق لكل عنصر في وقت متأخر. DelaysOfToleranceDesc=تتيح لك هذه الشاشة لتحديد التأخير قبل السماح تنبيه يقال على الشاشة مع picto ٪ ق لكل عنصر في وقت متأخر.
DelaysOfToleranceActionsToDo=تأخير التسامح (أيام) قبل اتخاذ إجراءات في حالة تأهب على المخطط لم تتحقق Delays_MAIN_DELAY_ACTIONS_TODO=تأخير التسامح (أيام) قبل اتخاذ إجراءات في حالة تأهب على المخطط لم تتحقق
DelaysOfToleranceOrdersToProcess=تأخير التسامح (أيام) قبل تنبيه على أوامر لم Delays_MAIN_DELAY_ORDERS_TO_PROCESS=تأخير التسامح (أيام) قبل تنبيه على أوامر لم
DelaysOfTolerancePropalsToClose=التسامح التأخير (في يوم) في حالة تأهب على المقترحات المعروضة ليقفل Delays_MAIN_DELAY_PROPALS_TO_CLOSE=التسامح التأخير (في يوم) في حالة تأهب على المقترحات المعروضة ليقفل
DelaysOfTolerancePropalsToBill=تأخير التسامح (أيام) قبل تنبيه بشأن المقترحات لا توصف Delays_MAIN_DELAY_PROPALS_TO_BILL=تأخير التسامح (أيام) قبل تنبيه بشأن المقترحات لا توصف
DelaysOfToleranceNotActivatedServices=تأخير التسامح (في يوم) في حالة تأهب قبل يوم والخدمات لتفعيل Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=تأخير التسامح (في يوم) في حالة تأهب قبل يوم والخدمات لتفعيل
DelaysOfToleranceRunningServices=تأخير التسامح (في أيام) قبل انتهاء حالة التأهب على الخدمات Delays_MAIN_DELAY_RUNNING_SERVICES=تأخير التسامح (في أيام) قبل انتهاء حالة التأهب على الخدمات
DelaysOfToleranceSupplierBillsToPay=تأخير التسامح (في يوم) في حالة تأهب قبل الموردين على الفواتير غير المدفوعة Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=تأخير التسامح (في يوم) في حالة تأهب قبل الموردين على الفواتير غير المدفوعة
DelaysOfToleranceCustomerBillsUnpaid=تأخير التسامح (في يوم) في حالة تأهب قبل العملاء على الفواتير غير المدفوعة Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=تأخير التسامح (في يوم) في حالة تأهب قبل العملاء على الفواتير غير المدفوعة
DelaysOfToleranceTransactionsToConciliate=تأخير التسامح (في يوم) في حالة تأهب قبل يوم في انتظار التسوية المصرفية Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=تأخير التسامح (في يوم) في حالة تأهب قبل يوم في انتظار التسوية المصرفية
DelaysOfToleranceChequesToDeposit=تأخير التسامح (في يوم) في حالة تأهب قبل لإيداع الشيكات للقيام Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=تأخير التسامح (في يوم) في حالة تأهب قبل لإيداع الشيكات للقيام
SetupDescription1=جميع البارامترات المتاحة في مجال الإعداد تسمح لك قبل البدء في الإعداد Dolibarr استخدامه. SetupDescription1=جميع البارامترات المتاحة في مجال الإعداد تسمح لك قبل البدء في الإعداد Dolibarr استخدامه.
SetupDescription2=2 إن أهم الخطوات هي الإعداد 2 أول من غادر في إعداد القائمة ، وهذا يعني الشركة / المؤسسة صفحة إعداد صفحة إعداد وحدات : SetupDescription2=2 إن أهم الخطوات هي الإعداد 2 أول من غادر في إعداد القائمة ، وهذا يعني الشركة / المؤسسة صفحة إعداد صفحة إعداد وحدات :
SetupDescription3=البارامترات في <b>إعداد</b> القائمة <b>--> الشركة / المؤسسة</b> المطلوب لأن مدخلات تستخدم المعلومات عن Dolibarr عرض وتعديل السلوك Dolibarr (على سبيل المثال لخصائص تتعلق بلدكم). SetupDescription3=البارامترات في <b>إعداد</b> القائمة <b>--> الشركة / المؤسسة</b> المطلوب لأن مدخلات تستخدم المعلومات عن Dolibarr عرض وتعديل السلوك Dolibarr (على سبيل المثال لخصائص تتعلق بلدكم).
@ -1056,7 +1056,7 @@ OnPayment=عن الدفع
// START - Lines generated via autotranslator.php tool (2009-08-19 21:36:45). // START - Lines generated via autotranslator.php tool (2009-08-19 21:36:45).
// Reference language: en_US // Reference language: en_US
DelaysOfToleranceMembers=تأخير التسامح (في يوم) في حالة تأهب قبل يوم تأخير رسوم العضوية Delays_MAIN_DELAY_MEMBERS=تأخير التسامح (في يوم) في حالة تأهب قبل يوم تأخير رسوم العضوية
SetupDescription5=القيود الأخرى القائمة في إدارة اختياري البارامترات. SetupDescription5=القيود الأخرى القائمة في إدارة اختياري البارامترات.
// STOP - Lines generated via autotranslator.php tool (2009-08-19 21:36:45). // STOP - Lines generated via autotranslator.php tool (2009-08-19 21:36:45).
@ -1252,7 +1252,7 @@ DictionnarySource=الأصل من مقترحات / أوامر
MenuSmartphoneManager=الهاتف الذكي القائمة مدير MenuSmartphoneManager=الهاتف الذكي القائمة مدير
DefaultMenuManager=معيار مدير القائمة DefaultMenuManager=معيار مدير القائمة
DefaultMenuSmartphoneManager=الهاتف الذكي القائمة مدير DefaultMenuSmartphoneManager=الهاتف الذكي القائمة مدير
DelaysOfToleranceSuppliersOrdersToProcess=التسامح التأخير (في أيام) قبل التنبيه على أوامر الموردين لم تتم معالجة حتى الآن Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=التسامح التأخير (في أيام) قبل التنبيه على أوامر الموردين لم تتم معالجة حتى الآن
SecurityEventsPurged=تطهير الاحداث الامنية SecurityEventsPurged=تطهير الاحداث الامنية
ShowProfIdInAddress=إظهار رقم حرفي مع عناوين على وثائق ShowProfIdInAddress=إظهار رقم حرفي مع عناوين على وثائق
TranslationUncomplete=ترجمة جزئية TranslationUncomplete=ترجمة جزئية

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

@ -787,18 +787,18 @@ DelayBeforeWarning=Termini abans d'alerta
DelaysBeforeWarning=Terminis abans d'alerta DelaysBeforeWarning=Terminis abans d'alerta
DelaysOfToleranceBeforeWarning=Terminis de tolerància abans d'alerta DelaysOfToleranceBeforeWarning=Terminis de tolerància abans d'alerta
DelaysOfToleranceDesc=Aquesta pantalla permet configura els terminis de tolerància abans que es alerti amb el símbol %s, sobre cada element en retard. DelaysOfToleranceDesc=Aquesta pantalla permet configura els terminis de tolerància abans que es alerti amb el símbol %s, sobre cada element en retard.
DelaysOfToleranceActionsToDo=Tolerància de retard abans de l'alerta (en dies) sobre accions planificades no realitzades Delays_MAIN_DELAY_ACTIONS_TODO=Tolerància de retard abans de l'alerta (en dies) sobre accions planificades no realitzades
DelaysOfToleranceOrdersToProcess=Tolerància de retard abans de l'alerta (en dies) sobre comandes de clients no processades Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolerància de retard abans de l'alerta (en dies) sobre comandes de clients no processades
DelaysOfToleranceSuppliersOrdersToProcess=Tolerància de retard abans de l'alerta (en dies) sobre comandes a proveïdors no processades Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerància de retard abans de l'alerta (en dies) sobre comandes a proveïdors no processades
DelaysOfTolerancePropalsToClose=Tolerància de retard abans de l'alerta (en dies) sobre pressupostos a tancar Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerància de retard abans de l'alerta (en dies) sobre pressupostos a tancar
DelaysOfTolerancePropalsToBill=Tolerància de retard abans de l'alerta (en dies) sobre pressupostos no facturats Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerància de retard abans de l'alerta (en dies) sobre pressupostos no facturats
DelaysOfToleranceNotActivatedServices=Tolerància de retard abans de l'alerta (en dies) sobre serveis a activar Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerància de retard abans de l'alerta (en dies) sobre serveis a activar
DelaysOfToleranceRunningServices=Tolerància de retard abans de l'alerta (en dies) sobre serveis expirats Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerància de retard abans de l'alerta (en dies) sobre serveis expirats
DelaysOfToleranceSupplierBillsToPay=Tolerància de retard abans de l'alerta (en dies) sobre factures de proveïdor impagades Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerància de retard abans de l'alerta (en dies) sobre factures de proveïdor impagades
DelaysOfToleranceCustomerBillsUnpaid=Tolerància de retard abans de l'alerta (en dies) sobre factures a client impagades Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerància de retard abans de l'alerta (en dies) sobre factures a client impagades
DelaysOfToleranceTransactionsToConciliate=Tolerància de retard abans de l'alerta (en dies) sobre conciliacions bancàries pendents Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerància de retard abans de l'alerta (en dies) sobre conciliacions bancàries pendents
DelaysOfToleranceMembers=Tolerància de retard abans de l'alerta (en dies) sobre cotitzacions adherents en retard Delays_MAIN_DELAY_MEMBERS=Tolerància de retard abans de l'alerta (en dies) sobre cotitzacions adherents en retard
DelaysOfToleranceChequesToDeposit=Tolerància de retard abans de l'alerta (en dies) sobre xecs a ingressar Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerància de retard abans de l'alerta (en dies) sobre xecs a ingressar
SetupDescription1=Totes les opcions de l'àrea de configuració són opcions que permeten configurar Dolibarr abans de començar la seva utilització. SetupDescription1=Totes les opcions de l'àrea de configuració són opcions que permeten configurar Dolibarr abans de començar la seva utilització.
SetupDescription2=Els 2 passos indispensables de la configuració són les 2 primeres al menú esquerre: la configuració de l'empresa/institució i la configuració dels mòduls: SetupDescription2=Els 2 passos indispensables de la configuració són les 2 primeres al menú esquerre: la configuració de l'empresa/institució i la configuració dels mòduls:
SetupDescription3=La configuració <b>Empresa/institució</b> a administrar és requerida ja que s'utilitza la informació per a la introducció de dades en la majoria de les pantalles, a insercions, o per modificar el comportament de Dolibarr (com, per exemple, de les funcions que depenen del seu país). SetupDescription3=La configuració <b>Empresa/institució</b> a administrar és requerida ja que s'utilitza la informació per a la introducció de dades en la majoria de les pantalles, a insercions, o per modificar el comportament de Dolibarr (com, per exemple, de les funcions que depenen del seu país).

1
htdocs/langs/ca_ES/contracts.lang
View File

@ -39,6 +39,7 @@ ConfirmCloseService=Esteu segur de voler tancar aquest servei?
ValidateAContract=Validar un contracte ValidateAContract=Validar un contracte
ActivateService=Activar el servei ActivateService=Activar el servei
ConfirmActivateService=Esteu segur de voler activar aquest servei en data %s? ConfirmActivateService=Esteu segur de voler activar aquest servei en data %s?
RefContract=Ref. contracte
DateContract=Data contracte DateContract=Data contracte
DateServiceActivate=Data activació del servei DateServiceActivate=Data activació del servei
DateServiceUnactivate=Data desactivació del servei DateServiceUnactivate=Data desactivació del servei

6
htdocs/langs/ca_ES/install.lang
View File

@ -155,7 +155,11 @@ MigrationShippingDelivery2=Actualització de les dades expedicions 2
MigrationFinished=Acabada l'actualització MigrationFinished=Acabada l'actualització
LastStepDesc=<strong>Últim pas</strong>: Indiqueu aquí el compte i la contrasenya del primer usuari que fareu servir per connectar-se a l'aplicació. No perdi aquests identificadors, és el compte que permet administrar la resta. LastStepDesc=<strong>Últim pas</strong>: Indiqueu aquí el compte i la contrasenya del primer usuari que fareu servir per connectar-se a l'aplicació. No perdi aquests identificadors, és el compte que permet administrar la resta.
ActivateModule=Activació del mòdul %s ActivateModule=Activació del mòdul %s
#########= LinkedElementsInvalidDeleted=han estat eliminats <b>%s</b> enllaços invàlids
NothingToDelete=No s'ha trobat enllaços invàlids
SourceType=Origen
TargetType=Destí
#########
# upgrade= # upgrade=
MigrationFixData=Correcció de dades desnormalitzades MigrationFixData=Correcció de dades desnormalitzades
MigrationOrder=Migració de dades de les comandes clients MigrationOrder=Migració de dades de les comandes clients

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

@ -567,16 +567,16 @@ DelayBeforeWarning=Forsinkelse, før advarsel
DelaysBeforeWarning=Forsinkelser inden advarsel DelaysBeforeWarning=Forsinkelser inden advarsel
DelaysOfToleranceBeforeWarning=Tolerance forsinkelser før advarsel DelaysOfToleranceBeforeWarning=Tolerance forsinkelser før advarsel
DelaysOfToleranceDesc=Dette skærmbillede giver dig mulighed for at definere tolereres forsinkelser før en indberetning er rapporteret på skærmen med picto %s for hver sent element. DelaysOfToleranceDesc=Dette skærmbillede giver dig mulighed for at definere tolereres forsinkelser før en indberetning er rapporteret på skærmen med picto %s for hver sent element.
DelaysOfToleranceActionsToDo=Delay tolerance (i dage) før alarm om planlagte tiltag endnu ikke realiseret Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (i dage) før alarm om planlagte tiltag endnu ikke realiseret
DelaysOfToleranceOrdersToProcess=Delay tolerance (i dage) inden indberetning om ordrer endnu ikke gjort Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (i dage) inden indberetning om ordrer endnu ikke gjort
DelaysOfTolerancePropalsToClose=Delay tolerance (i dage) inden indberetning om forslag til at lukke Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (i dage) inden indberetning om forslag til at lukke
DelaysOfTolerancePropalsToBill=Delay tolerance (i dage) inden indberetning om forslag ikke faktureret Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (i dage) inden indberetning om forslag ikke faktureret
DelaysOfToleranceNotActivatedServices=Tolerance forsinkelse (i dage) før alarm om tjenesteydelser for at aktivere Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance forsinkelse (i dage) før alarm om tjenesteydelser for at aktivere
DelaysOfToleranceRunningServices=Tolerance forsinkelse (i dage) inden indberetning om udløb tjenester Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance forsinkelse (i dage) inden indberetning om udløb tjenester
DelaysOfToleranceSupplierBillsToPay=Tolerance forsinkelse (i dage) inden indberetning om ubetalte leverandør fakturaer Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance forsinkelse (i dage) inden indberetning om ubetalte leverandør fakturaer
DelaysOfToleranceCustomerBillsUnpaid=Tolerance forsinkelse (i dage) inden indberetning om ubetalte klient fakturaer Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerance forsinkelse (i dage) inden indberetning om ubetalte klient fakturaer
DelaysOfToleranceTransactionsToConciliate=Tolerance forsinkelse (i dage) inden indberetning om verserende bank forsoning Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance forsinkelse (i dage) inden indberetning om verserende bank forsoning
DelaysOfToleranceChequesToDeposit=Tolerance forsinkelse (i dage) før alarm for checks depositum til at gøre Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance forsinkelse (i dage) før alarm for checks depositum til at gøre
SetupDescription1=Alle parametre til rådighed i setup-området giver dig mulighed for at setup Dolibarr før du begynder at bruge den. SetupDescription1=Alle parametre til rådighed i setup-området giver dig mulighed for at setup Dolibarr før du begynder at bruge den.
SetupDescription2=De 2 vigtigste opsætningen trin er de 2 første talere i venstre opsætningsmenuen, betyder Company / fundation opsætningsside og Moduler setup side: SetupDescription2=De 2 vigtigste opsætningen trin er de 2 første talere i venstre opsætningsmenuen, betyder Company / fundation opsætningsside og Moduler setup side:
SetupDescription3=<b>Company / fundation</b> setup er nødvendig, fordi input oplysninger bruges på Dolibarr displays og at ændre Dolibarr adfærd (for eksempel for funktioner i relation til dit land). SetupDescription3=<b>Company / fundation</b> setup er nødvendig, fordi input oplysninger bruges på Dolibarr displays og at ændre Dolibarr adfærd (for eksempel for funktioner i relation til dit land).
@ -1135,7 +1135,7 @@ DatabaseServer=Database vært
DatabaseUser=Database bruger DatabaseUser=Database bruger
DatabasePassword=Database password DatabasePassword=Database password
EnableShowLogo=Vis logo på venstre menu EnableShowLogo=Vis logo på venstre menu
DelaysOfToleranceMembers=Tolerance forsinkelse (i dag), inden indberetning om forsinket medlemskab gebyr Delays_MAIN_DELAY_MEMBERS=Tolerance forsinkelse (i dag), inden indberetning om forsinket medlemskab gebyr
MAIN_ROUNDING_RULE_TOT=Størrelse på afrunding række (for sjældne lande, hvor afrunding sker på noget andet end base 10) MAIN_ROUNDING_RULE_TOT=Størrelse på afrunding række (for sjældne lande, hvor afrunding sker på noget andet end base 10)
UnitPriceOfProduct=Net enhedsprisen på en vare UnitPriceOfProduct=Net enhedsprisen på en vare
TotalPriceAfterRounding=Samlet pris (net / beholder / incl moms) efter afrunding TotalPriceAfterRounding=Samlet pris (net / beholder / incl moms) efter afrunding
@ -1257,7 +1257,7 @@ DictionnarySource=Oprindelse af forslag / ordrer
MenuSmartphoneManager=Smartphone menu manager MenuSmartphoneManager=Smartphone menu manager
DefaultMenuManager=Standard menu manager DefaultMenuManager=Standard menu manager
DefaultMenuSmartphoneManager=Smartphone menu manager DefaultMenuSmartphoneManager=Smartphone menu manager
DelaysOfToleranceSuppliersOrdersToProcess=Forsinkelse tolerance (i dage) før alarm på leverandører ordrer endnu ikke behandlet Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Forsinkelse tolerance (i dage) før alarm på leverandører ordrer endnu ikke behandlet
SecurityEventsPurged=Sikkerhed begivenheder renset SecurityEventsPurged=Sikkerhed begivenheder renset
ShowProfIdInAddress=Vis Professionel id med adresser på dokumenter ShowProfIdInAddress=Vis Professionel id med adresser på dokumenter
TranslationUncomplete=Delvis oversættelse TranslationUncomplete=Delvis oversættelse

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

@ -561,15 +561,15 @@ DelayBeforeWarning=Benachrichtigungsverzögerung
DelaysBeforeWarning=Benachrichtigungsverzögerungen DelaysBeforeWarning=Benachrichtigungsverzögerungen
DelaysOfToleranceBeforeWarning=Verspätungstoleranz vor Benachrichtigungen DelaysOfToleranceBeforeWarning=Verspätungstoleranz vor Benachrichtigungen
DelaysOfToleranceDesc=Hier können Sie die Verspätungstoleranz einstellen, bevor eine Benachrichtigung auf dem Bildschirm für jedes verspätete Element mit dem Symbol %s ausgegeben wird. DelaysOfToleranceDesc=Hier können Sie die Verspätungstoleranz einstellen, bevor eine Benachrichtigung auf dem Bildschirm für jedes verspätete Element mit dem Symbol %s ausgegeben wird.
DelaysOfToleranceActionsToDo=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über die noch nicht erledigte, geplante Maßnahme Delays_MAIN_DELAY_ACTIONS_TODO=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über die noch nicht erledigte, geplante Maßnahme
DelaysOfToleranceOrdersToProcess=Verzögerungstoleranz (in Tagen) vor Benachrichtigung noch nicht bearbeitete Aufträge Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Verzögerungstoleranz (in Tagen) vor Benachrichtigung noch nicht bearbeitete Aufträge
DelaysOfTolerancePropalsToClose=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über abzuschließende Angebote Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über abzuschließende Angebote
DelaysOfTolerancePropalsToBill=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über nicht in Rechnung gestellte Angebote Delays_MAIN_DELAY_PROPALS_TO_BILL=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über nicht in Rechnung gestellte Angebote
DelaysOfToleranceNotActivatedServices=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über zu aktivierende Services Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über zu aktivierende Services
DelaysOfToleranceRunningServices=Verzögerungstoleranz (in Tagen) vor Benachrichtigung zu überfälligen Services Delays_MAIN_DELAY_RUNNING_SERVICES=Verzögerungstoleranz (in Tagen) vor Benachrichtigung zu überfälligen Services
DelaysOfToleranceSupplierBillsToPay=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über unbezahlte Lieferantenrechnungen Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über unbezahlte Lieferantenrechnungen
DelaysOfToleranceTransactionsToConciliate=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über Bankkontenabgleich Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über Bankkontenabgleich
DelaysOfToleranceChequesToDeposit=Verzögerungstoleranz (in Tagen) vor der Benachrichtigung über einzulösende Schecks Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Verzögerungstoleranz (in Tagen) vor der Benachrichtigung über einzulösende Schecks
SetupDescription1=Alle Parameter in der Einstellungsübersicht erlauben Ihnen die Konfiguration des Systems vor Inbetriebnahme. SetupDescription1=Alle Parameter in der Einstellungsübersicht erlauben Ihnen die Konfiguration des Systems vor Inbetriebnahme.
SetupDescription2=Die 2 wichtigsten Schritte zur Einrichtung finden Sie in den ersten beiden Zeilen des Einstellungen-Menüs auf der linken Seite. Dies sind die 'Unternehmen/Stiftung'- und die 'Moduleinstellungen'-Menüpunkte: SetupDescription2=Die 2 wichtigsten Schritte zur Einrichtung finden Sie in den ersten beiden Zeilen des Einstellungen-Menüs auf der linken Seite. Dies sind die 'Unternehmen/Stiftung'- und die 'Moduleinstellungen'-Menüpunkte:
SetupDescription3=Die Einstellungen unter <b>Firma/Stiftung</b> werden für die Anzeige im System und die länderspezifische Anpassung dessen Verhaltens zwingend benötigt. SetupDescription3=Die Einstellungen unter <b>Firma/Stiftung</b> werden für die Anzeige im System und die länderspezifische Anpassung dessen Verhaltens zwingend benötigt.
@ -1043,7 +1043,7 @@ MultiCompanySetup=Multi-Company-Moduleinstellungen
UseSearchToSelectCompany=Suchfeld statt Listenansicht für Partnerauswahl verwenden UseSearchToSelectCompany=Suchfeld statt Listenansicht für Partnerauswahl verwenden
ProtectAndEncryptPdfFilesDesc=Die Aktivierung des PDF-Dokumentschutzes erhält die Lesbarkeit und Druckfähigkeit des Dokuments, Bearbeitung und Kopien sind jedoch nicht mehr möglich. Bitte beachten Sie, dass über die Aktivierung dieser Funktion auch die Stapelverarbeitung von PDF-Dokumenten (z.B. aller offenen Rechnungen) nicht mehr funktioniert ProtectAndEncryptPdfFilesDesc=Die Aktivierung des PDF-Dokumentschutzes erhält die Lesbarkeit und Druckfähigkeit des Dokuments, Bearbeitung und Kopien sind jedoch nicht mehr möglich. Bitte beachten Sie, dass über die Aktivierung dieser Funktion auch die Stapelverarbeitung von PDF-Dokumenten (z.B. aller offenen Rechnungen) nicht mehr funktioniert
DelaysOfToleranceCustomerBillsUnpaid=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über unbezahlte Kundenrechnungen Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über unbezahlte Kundenrechnungen
UseSearchToSelectProduct=Suchfeld statt Listenansicht für die Produktauswahl verwenden UseSearchToSelectProduct=Suchfeld statt Listenansicht für die Produktauswahl verwenden
SessionSaveHandler=Handler für Sitzungsspeicherung SessionSaveHandler=Handler für Sitzungsspeicherung
@ -1115,7 +1115,7 @@ DatabaseServer=Datenbankserver
DatabaseUser=Datenbankbenutzer DatabaseUser=Datenbankbenutzer
DatabasePassword=Datenbankpasswort DatabasePassword=Datenbankpasswort
EnableShowLogo=Logo über dem linken Menüs anzeigen EnableShowLogo=Logo über dem linken Menüs anzeigen
DelaysOfToleranceMembers=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über verspätete Mitgliedsbeiträge Delays_MAIN_DELAY_MEMBERS=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über verspätete Mitgliedsbeiträge
MAIN_ROUNDING_RULE_TOT=Rundungseinstellung (für Länder in denen die Rundung nicht auf Basis 10 errechnet wird - selten) MAIN_ROUNDING_RULE_TOT=Rundungseinstellung (für Länder in denen die Rundung nicht auf Basis 10 errechnet wird - selten)
UnitPriceOfProduct=Nettostückpreis UnitPriceOfProduct=Nettostückpreis
TotalPriceAfterRounding=Gesamtpreis (Netto/MwSt./Brutto) gerundet TotalPriceAfterRounding=Gesamtpreis (Netto/MwSt./Brutto) gerundet

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

@ -780,18 +780,18 @@ DelayBeforeWarning=Frist bis zur Benachrichtigung
DelaysBeforeWarning=Fristen bis zur Benachrichtigung DelaysBeforeWarning=Fristen bis zur Benachrichtigung
DelaysOfToleranceBeforeWarning=Toleranz für die Frist vor Benachrichtigungen DelaysOfToleranceBeforeWarning=Toleranz für die Frist vor Benachrichtigungen
DelaysOfToleranceDesc=Hier können Sie die Verspätungstoleranz einstellen, bevor eine Benachrichtigung auf dem Bildschirm für jedes verspätete Element mit dem Symbol %s ausgegeben wird. DelaysOfToleranceDesc=Hier können Sie die Verspätungstoleranz einstellen, bevor eine Benachrichtigung auf dem Bildschirm für jedes verspätete Element mit dem Symbol %s ausgegeben wird.
DelaysOfToleranceActionsToDo=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über die noch nicht erledigte, geplante Maßnahme Delays_MAIN_DELAY_ACTIONS_TODO=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über die noch nicht erledigte, geplante Maßnahme
DelaysOfToleranceOrdersToProcess=Verzögerungstoleranz (in Tagen) vor Benachrichtigung noch nicht bearbeitete Aufträge Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Verzögerungstoleranz (in Tagen) vor Benachrichtigung noch nicht bearbeitete Aufträge
DelaysOfToleranceSuppliersOrdersToProcess=Verzögerungstoleranz (in Tagen), bevor Alarm für nicht bearbeteitet Lieferanten-Bestellungen aktiviert wird Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Verzögerungstoleranz (in Tagen), bevor Alarm für nicht bearbeteitet Lieferanten-Bestellungen aktiviert wird
DelaysOfTolerancePropalsToClose=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über abzuschließende Angebote Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über abzuschließende Angebote
DelaysOfTolerancePropalsToBill=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über nicht in Rechnung gestellte Angebote Delays_MAIN_DELAY_PROPALS_TO_BILL=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über nicht in Rechnung gestellte Angebote
DelaysOfToleranceNotActivatedServices=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über zu aktivierende Leistungen Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über zu aktivierende Leistungen
DelaysOfToleranceRunningServices=Verzögerungstoleranz (in Tagen) vor Benachrichtigung zu überfälligen Leistungen Delays_MAIN_DELAY_RUNNING_SERVICES=Verzögerungstoleranz (in Tagen) vor Benachrichtigung zu überfälligen Leistungen
DelaysOfToleranceSupplierBillsToPay=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über unbezahlte Lieferantenrechnungen Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über unbezahlte Lieferantenrechnungen
DelaysOfToleranceCustomerBillsUnpaid=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über unbezahlte Kundenrechnungen Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über unbezahlte Kundenrechnungen
DelaysOfToleranceTransactionsToConciliate=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über Bankkontenabgleich Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über Bankkontenabgleich
DelaysOfToleranceMembers=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über verspätete Mitgliedsbeiträge Delays_MAIN_DELAY_MEMBERS=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über verspätete Mitgliedsbeiträge
DelaysOfToleranceChequesToDeposit=Verzögerungstoleranz (in Tagen) vor der Benachrichtigung über einzulösende Schecks Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Verzögerungstoleranz (in Tagen) vor der Benachrichtigung über einzulösende Schecks
SetupDescription1=Alle Parameter in der Einstellungsübersicht erlauben Ihnen die Konfiguration des Systems vor Inbetriebnahme. SetupDescription1=Alle Parameter in der Einstellungsübersicht erlauben Ihnen die Konfiguration des Systems vor Inbetriebnahme.
SetupDescription2=Die 2 wichtigsten Schritte zur Einrichtung finden Sie in den ersten beiden Zeilen des Einstellungen-Menüs auf der linken Seite. Dies sind die 'Unternehmen/Stiftung'- und die 'Moduleinstellungen'-Menüpunkte: SetupDescription2=Die 2 wichtigsten Schritte zur Einrichtung finden Sie in den ersten beiden Zeilen des Einstellungen-Menüs auf der linken Seite. Dies sind die 'Unternehmen/Stiftung'- und die 'Moduleinstellungen'-Menüpunkte:
SetupDescription3=Die Einstellungen unter <b>Firma/Stiftung</b> werden für die Anzeige im System und die länderspezifische Anpassung dessen Verhaltens zwingend benötigt. SetupDescription3=Die Einstellungen unter <b>Firma/Stiftung</b> werden für die Anzeige im System und die länderspezifische Anpassung dessen Verhaltens zwingend benötigt.

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

@ -599,18 +599,18 @@ DelayBeforeWarning=Καθυστέρηση πριν την προειδοποίη
DelaysBeforeWarning=Καθυστερήσεις πριν την προειδοποίηση DelaysBeforeWarning=Καθυστερήσεις πριν την προειδοποίηση
DelaysOfToleranceBeforeWarning=Tolerance delays before warning DelaysOfToleranceBeforeWarning=Tolerance delays before warning
DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element. DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
DelaysOfToleranceActionsToDo=Delay tolerance (in days) before alert on planned actions not yet realised Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned actions not yet realised
DelaysOfToleranceOrdersToProcess=Delay tolerance (in days) before alert on orders not yet done Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not yet done
DelaysOfToleranceSuppliersOrdersToProcess=Delay tolerance (in days) before alert on suppliers orders not yet processed Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not yet processed
DelaysOfTolerancePropalsToClose=Delay tolerance (in days) before alert on proposals to close Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
DelaysOfTolerancePropalsToBill=Delay tolerance (in days) before alert on proposals not billed Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
DelaysOfToleranceNotActivatedServices=Tolerance delay (in days) before alert on services to activate Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
DelaysOfToleranceRunningServices=Tolerance delay (in days) before alert on expired services Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
DelaysOfToleranceSupplierBillsToPay=Tolerance delay (in days) before alert on unpaid supplier invoices Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
DelaysOfToleranceCustomerBillsUnpaid=Tolerence delay (in days) before alert on unpaid client invoices Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
DelaysOfToleranceTransactionsToConciliate=Tolerance delay (in days) before alert on pending bank reconciliation Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
DelaysOfToleranceMembers=Tolerance delay (in days) before alert on delayed membership fee Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
DelaysOfToleranceChequesToDeposit=Tolerance delay (in days) before alert for cheques deposit to do Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
SetupDescription1=All parameters available in the setup area allow you to setup Dolibarr before starting using it. SetupDescription1=All parameters available in the setup area allow you to setup Dolibarr before starting using it.
SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page: SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page:
SetupDescription3=Parameters in menu <b>Setup -> Company/foundation</b> are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country). SetupDescription3=Parameters in menu <b>Setup -> Company/foundation</b> are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country).

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

@ -779,18 +779,18 @@ DelayBeforeWarning=Delay before warning
DelaysBeforeWarning=Delays before warning DelaysBeforeWarning=Delays before warning
DelaysOfToleranceBeforeWarning=Tolerance delays before warning DelaysOfToleranceBeforeWarning=Tolerance delays before warning
DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element. DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
DelaysOfToleranceActionsToDo=Delay tolerance (in days) before alert on planned events not yet realised Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events not yet realised
DelaysOfToleranceOrdersToProcess=Delay tolerance (in days) before alert on orders not yet processed Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not yet processed
DelaysOfToleranceSuppliersOrdersToProcess=Delay tolerance (in days) before alert on suppliers orders not yet processed Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not yet processed
DelaysOfTolerancePropalsToClose=Delay tolerance (in days) before alert on proposals to close Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
DelaysOfTolerancePropalsToBill=Delay tolerance (in days) before alert on proposals not billed Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
DelaysOfToleranceNotActivatedServices=Tolerance delay (in days) before alert on services to activate Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
DelaysOfToleranceRunningServices=Tolerance delay (in days) before alert on expired services Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
DelaysOfToleranceSupplierBillsToPay=Tolerance delay (in days) before alert on unpaid supplier invoices Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
DelaysOfToleranceCustomerBillsUnpaid=Tolerence delay (in days) before alert on unpaid client invoices Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
DelaysOfToleranceTransactionsToConciliate=Tolerance delay (in days) before alert on pending bank reconciliation Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
DelaysOfToleranceMembers=Tolerance delay (in days) before alert on delayed membership fee Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
DelaysOfToleranceChequesToDeposit=Tolerance delay (in days) before alert for cheques deposit to do Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
SetupDescription1=All parameters available in the setup area allow you to setup Dolibarr before starting using it. SetupDescription1=All parameters available in the setup area allow you to setup Dolibarr before starting using it.
SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page: SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page:
SetupDescription3=Parameters in menu <b>Setup -> Company/foundation</b> are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country). SetupDescription3=Parameters in menu <b>Setup -> Company/foundation</b> are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country).

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

@ -787,18 +787,18 @@ DelayBeforeWarning=Plazo antes de alerta
DelaysBeforeWarning=Plazos antes de alerta DelaysBeforeWarning=Plazos antes de alerta
DelaysOfToleranceBeforeWarning=Plazos de tolerancia antes de alerta DelaysOfToleranceBeforeWarning=Plazos de tolerancia antes de alerta
DelaysOfToleranceDesc=Esta pantalla permite configura los plazos de tolerancia antes de que se alerte con el símbolo %s, sobre cada elemento en retraso. DelaysOfToleranceDesc=Esta pantalla permite configura los plazos de tolerancia antes de que se alerte con el símbolo %s, sobre cada elemento en retraso.
DelaysOfToleranceActionsToDo=Tolerancia de retraso antes de la alerta (en días) sobre acciones planificadas no realizadas Delays_MAIN_DELAY_ACTIONS_TODO=Tolerancia de retraso antes de la alerta (en días) sobre acciones planificadas no realizadas
DelaysOfToleranceOrdersToProcess=Tolerancia de retraso antes de la alerta (en días) sobre pedidos de clientes no procesados Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolerancia de retraso antes de la alerta (en días) sobre pedidos de clientes no procesados
DelaysOfToleranceSuppliersOrdersToProcess=Tolerancia de retraso antes de la alerta (en días) sobre pedidos a proveedores no procesados Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerancia de retraso antes de la alerta (en días) sobre pedidos a proveedores no procesados
DelaysOfTolerancePropalsToClose=Tolerancia de retraso antes de la alerta (en días) sobre presupuestos a cerrar Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerancia de retraso antes de la alerta (en días) sobre presupuestos a cerrar
DelaysOfTolerancePropalsToBill=Tolerancia de retraso antes de la alerta (en días) sobre presupuestos no facturados Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerancia de retraso antes de la alerta (en días) sobre presupuestos no facturados
DelaysOfToleranceNotActivatedServices=Tolerancia de retraso antes de la alerta (en días) sobre servicios a activar Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerancia de retraso antes de la alerta (en días) sobre servicios a activar
DelaysOfToleranceRunningServices=Tolerancia de retraso antes de la alerta (en días) sobre servicios expirados Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerancia de retraso antes de la alerta (en días) sobre servicios expirados
DelaysOfToleranceSupplierBillsToPay=Tolerancia de retraso antes de la alerta (en días) sobre facturas de proveedor impagadas Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerancia de retraso antes de la alerta (en días) sobre facturas de proveedor impagadas
DelaysOfToleranceCustomerBillsUnpaid=Tolerancia de retraso antes de la alerta (en días) sobre facturas a cliente impagadas Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerancia de retraso antes de la alerta (en días) sobre facturas a cliente impagadas
DelaysOfToleranceTransactionsToConciliate=Tolerancia de retraso antes de la alerta (en días) sobre conciliaciones bancarias pendientes Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerancia de retraso antes de la alerta (en días) sobre conciliaciones bancarias pendientes
DelaysOfToleranceMembers=Tolerancia de retraso entes de la alerta (en días) sobre cotizaciones adherentes en retraso Delays_MAIN_DELAY_MEMBERS=Tolerancia de retraso entes de la alerta (en días) sobre cotizaciones adherentes en retraso
DelaysOfToleranceChequesToDeposit=Tolerancia de retraso entes de la alerta (en días) sobre cheques a ingresar Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancia de retraso entes de la alerta (en días) sobre cheques a ingresar
SetupDescription1=Todas las opciones del área de configuración son opciones que permiten configurar a Dolibarr antes de empezar su utilización. SetupDescription1=Todas las opciones del área de configuración son opciones que permiten configurar a Dolibarr antes de empezar su utilización.
SetupDescription2=Los 2 pasos indispensables de la configuración son las 2 primeras en el menú izquierdo: la configuración de la empresa/institución y la configuración de los módulos: SetupDescription2=Los 2 pasos indispensables de la configuración son las 2 primeras en el menú izquierdo: la configuración de la empresa/institución y la configuración de los módulos:
SetupDescription3=La configuración <b>Empresa/institución</b> a administrar es requerida ya que se utiliza la información para la introducción de datos en la mayoría de las pantallas, en inserciones, o para modificar el comportamiento de Dolibarr (como, por ejemplo, de las funciones que dependen de su país). SetupDescription3=La configuración <b>Empresa/institución</b> a administrar es requerida ya que se utiliza la información para la introducción de datos en la mayoría de las pantallas, en inserciones, o para modificar el comportamiento de Dolibarr (como, por ejemplo, de las funciones que dependen de su país).

1
htdocs/langs/es_ES/contracts.lang
View File

@ -39,6 +39,7 @@ ConfirmCloseService=¿Está seguro de querer cerrar este servicio?
ValidateAContract=Validar un contrato ValidateAContract=Validar un contrato
ActivateService=Activar el servicio ActivateService=Activar el servicio
ConfirmActivateService=¿Está seguro de querer activar este servicio en fecha %s? ConfirmActivateService=¿Está seguro de querer activar este servicio en fecha %s?
RefContract=Ref. contrato
DateContract=Fecha contrato DateContract=Fecha contrato
DateServiceActivate=Fecha activación del servicio DateServiceActivate=Fecha activación del servicio
DateServiceUnactivate=Fecha desactivación del servicio DateServiceUnactivate=Fecha desactivación del servicio

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

@ -155,6 +155,10 @@ MigrationShippingDelivery2=Actualización de los datos de expediciones 2
MigrationFinished=Actualización terminada MigrationFinished=Actualización terminada
LastStepDesc=<strong>Último paso</strong>: Indique aquí la cuenta y la contraseña del primer usuario que usted utilizará para conectarse a la aplicación. No pierda estos identificadores, es la cuenta que permite administrar el resto. LastStepDesc=<strong>Último paso</strong>: Indique aquí la cuenta y la contraseña del primer usuario que usted utilizará para conectarse a la aplicación. No pierda estos identificadores, es la cuenta que permite administrar el resto.
ActivateModule=Activación del módulo %s ActivateModule=Activación del módulo %s
LinkedElementsInvalidDeleted=han sido eliminados <b>%s</b> enlaces inválidos
NothingToDelete=No se han encontrado enlaces inválidos
SourceType=Origen
TargetType=Destino
######### #########
# upgrade # upgrade
MigrationFixData=Corrección de datos desnormalizados MigrationFixData=Corrección de datos desnormalizados

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

@ -776,18 +776,18 @@ DelayBeforeWarning=Viivitus enne hoiatuse
DelaysBeforeWarning=Viivitused enne hoiatuse DelaysBeforeWarning=Viivitused enne hoiatuse
DelaysOfToleranceBeforeWarning=Tolerance viivitused enne hoiatuse DelaysOfToleranceBeforeWarning=Tolerance viivitused enne hoiatuse
DelaysOfToleranceDesc=See ekraan võimaldab määrata talutavad viivitused enne märguanne teatas ekraani eva %s iga hilja element. DelaysOfToleranceDesc=See ekraan võimaldab määrata talutavad viivitused enne märguanne teatas ekraani eva %s iga hilja element.
DelaysOfToleranceActionsToDo=Delay sallivus (päevades) enne märguanne kavandatud üritused ei ole veel aru Delays_MAIN_DELAY_ACTIONS_TODO=Delay sallivus (päevades) enne märguanne kavandatud üritused ei ole veel aru
DelaysOfToleranceOrdersToProcess=Delay sallivus (päevades) enne märguanne tellimuste ole veel töödeldud Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay sallivus (päevades) enne märguanne tellimuste ole veel töödeldud
DelaysOfToleranceSuppliersOrdersToProcess=Delay sallivus (päevades) enne märguanne tarnijatele tellimusi ei ole veel töödeldud Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay sallivus (päevades) enne märguanne tarnijatele tellimusi ei ole veel töödeldud
DelaysOfTolerancePropalsToClose=Delay sallivus (päevades) enne märguanne ettepanekute sulgeda Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay sallivus (päevades) enne märguanne ettepanekute sulgeda
DelaysOfTolerancePropalsToBill=Delay sallivus (päevades) enne märguanne ettepanekuid ei maksustata Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay sallivus (päevades) enne märguanne ettepanekuid ei maksustata
DelaysOfToleranceNotActivatedServices=Tolerance viivitus (päevades) enne märguanne teenuste aktiveerimiseks Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance viivitus (päevades) enne märguanne teenuste aktiveerimiseks
DelaysOfToleranceRunningServices=Tolerance viivitus (päevades) enne märguanne on aegunud teenused Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance viivitus (päevades) enne märguanne on aegunud teenused
DelaysOfToleranceSupplierBillsToPay=Tolerance viivitus (päevades) enne märguanne tasustamata tarnija arved Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance viivitus (päevades) enne märguanne tasustamata tarnija arved
DelaysOfToleranceCustomerBillsUnpaid=Tingitud hälve viivitus (päevades) enne märguanne tasustamata klientide arved Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tingitud hälve viivitus (päevades) enne märguanne tasustamata klientide arved
DelaysOfToleranceTransactionsToConciliate=Tolerance viivitus (päevades) enne märguande ootel panga leppimine Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance viivitus (päevades) enne märguande ootel panga leppimine
DelaysOfToleranceMembers=Tolerance viivitus (päevades) enne märguanne hilinenud liitumistasu Delays_MAIN_DELAY_MEMBERS=Tolerance viivitus (päevades) enne märguanne hilinenud liitumistasu
DelaysOfToleranceChequesToDeposit=Tolerance viivitus (päevades) enne häire kontrollimiseks hoiule teha Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance viivitus (päevades) enne häire kontrollimiseks hoiule teha
SetupDescription1=Kõik parameetrid saadaval setup ala võimaldab teil seadistada Dolibarr enne kasutamist. SetupDescription1=Kõik parameetrid saadaval setup ala võimaldab teil seadistada Dolibarr enne kasutamist.
SetupDescription2=2 kõige tähtsam setup sammud on 2 1. omadega vasakule setup menu, see tähendab Company / sihtasutus setup lehele ja moodulid setup page: SetupDescription2=2 kõige tähtsam setup sammud on 2 1. omadega vasakule setup menu, see tähendab Company / sihtasutus setup lehele ja moodulid setup page:
SetupDescription3=Parameetrite menüüs <b>Setup -&gt; Company / alus</b> on vajalik, sest sisend andmeid kasutatakse Dolibarr Näidikute ja muuta Dolibarr käitumine (näiteks funktsioone, mis on seotud teie riigi kohta). SetupDescription3=Parameetrite menüüs <b>Setup -&gt; Company / alus</b> on vajalik, sest sisend andmeid kasutatakse Dolibarr Näidikute ja muuta Dolibarr käitumine (näiteks funktsioone, mis on seotud teie riigi kohta).

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

@ -647,16 +647,16 @@ DelayBeforeWarning=قبل التحذير من التأخير
DelaysBeforeWarning=محذرا من التأخير قبل DelaysBeforeWarning=محذرا من التأخير قبل
DelaysOfToleranceBeforeWarning=محذرا من التأخير قبل التسامح DelaysOfToleranceBeforeWarning=محذرا من التأخير قبل التسامح
DelaysOfToleranceDesc=تتيح لك هذه الشاشة لتحديد التأخير قبل السماح تنبيه يقال على الشاشة مع picto ٪ ق لكل عنصر في وقت متأخر. DelaysOfToleranceDesc=تتيح لك هذه الشاشة لتحديد التأخير قبل السماح تنبيه يقال على الشاشة مع picto ٪ ق لكل عنصر في وقت متأخر.
DelaysOfToleranceActionsToDo=تأخير التسامح (أيام) قبل اتخاذ إجراءات في حالة تأهب على المخطط لم تتحقق Delays_MAIN_DELAY_ACTIONS_TODO=تأخير التسامح (أيام) قبل اتخاذ إجراءات في حالة تأهب على المخطط لم تتحقق
DelaysOfToleranceOrdersToProcess=تأخير التسامح (أيام) قبل تنبيه على أوامر لم Delays_MAIN_DELAY_ORDERS_TO_PROCESS=تأخير التسامح (أيام) قبل تنبيه على أوامر لم
DelaysOfTolerancePropalsToClose=التسامح التأخير (في يوم) في حالة تأهب على المقترحات المعروضة ليقفل Delays_MAIN_DELAY_PROPALS_TO_CLOSE=التسامح التأخير (في يوم) في حالة تأهب على المقترحات المعروضة ليقفل
DelaysOfTolerancePropalsToBill=تأخير التسامح (أيام) قبل تنبيه بشأن المقترحات لا توصف Delays_MAIN_DELAY_PROPALS_TO_BILL=تأخير التسامح (أيام) قبل تنبيه بشأن المقترحات لا توصف
DelaysOfToleranceNotActivatedServices=تأخير التسامح (في يوم) في حالة تأهب قبل يوم والخدمات لتفعيل Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=تأخير التسامح (في يوم) في حالة تأهب قبل يوم والخدمات لتفعيل
DelaysOfToleranceRunningServices=تأخير التسامح (في أيام) قبل انتهاء حالة التأهب على الخدمات Delays_MAIN_DELAY_RUNNING_SERVICES=تأخير التسامح (في أيام) قبل انتهاء حالة التأهب على الخدمات
DelaysOfToleranceSupplierBillsToPay=تأخير التسامح (في يوم) في حالة تأهب قبل الموردين على الفواتير غير المدفوعة Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=تأخير التسامح (في يوم) في حالة تأهب قبل الموردين على الفواتير غير المدفوعة
DelaysOfToleranceCustomerBillsUnpaid=تأخير التسامح (في يوم) في حالة تأهب قبل العملاء على الفواتير غير المدفوعة Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=تأخير التسامح (في يوم) في حالة تأهب قبل العملاء على الفواتير غير المدفوعة
DelaysOfToleranceTransactionsToConciliate=تأخير التسامح (في يوم) في حالة تأهب قبل يوم في انتظار التسوية المصرفية Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=تأخير التسامح (في يوم) في حالة تأهب قبل يوم في انتظار التسوية المصرفية
DelaysOfToleranceChequesToDeposit=تأخير التسامح (في يوم) في حالة تأهب قبل لإيداع الشيكات للقيام Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=تأخير التسامح (في يوم) في حالة تأهب قبل لإيداع الشيكات للقيام
SetupDescription1=جميع البارامترات المتاحة في مجال الإعداد تسمح لك قبل البدء في الإعداد Dolibarr استخدامه. SetupDescription1=جميع البارامترات المتاحة في مجال الإعداد تسمح لك قبل البدء في الإعداد Dolibarr استخدامه.
SetupDescription2=2 إن أهم الخطوات هي الإعداد 2 أول من غادر في إعداد القائمة ، وهذا يعني الشركة / المؤسسة صفحة إعداد صفحة إعداد وحدات : SetupDescription2=2 إن أهم الخطوات هي الإعداد 2 أول من غادر في إعداد القائمة ، وهذا يعني الشركة / المؤسسة صفحة إعداد صفحة إعداد وحدات :
SetupDescription3=البارامترات في <b>إعداد</b> القائمة <b>--> الشركة / المؤسسة</b> المطلوب لأن مدخلات تستخدم المعلومات عن Dolibarr عرض وتعديل السلوك Dolibarr (على سبيل المثال لخصائص تتعلق بلدكم). SetupDescription3=البارامترات في <b>إعداد</b> القائمة <b>--> الشركة / المؤسسة</b> المطلوب لأن مدخلات تستخدم المعلومات عن Dolibarr عرض وتعديل السلوك Dolibarr (على سبيل المثال لخصائص تتعلق بلدكم).
@ -1067,7 +1067,7 @@ OnPayment=عن الدفع
// START - Lines generated via autotranslator.php tool (2009-08-19 21:36:45). // START - Lines generated via autotranslator.php tool (2009-08-19 21:36:45).
// Reference language: en_US // Reference language: en_US
DelaysOfToleranceMembers=تأخير التسامح (في يوم) في حالة تأهب قبل يوم تأخير رسوم العضوية Delays_MAIN_DELAY_MEMBERS=تأخير التسامح (في يوم) في حالة تأهب قبل يوم تأخير رسوم العضوية
SetupDescription5=القيود الأخرى القائمة في إدارة اختياري البارامترات. SetupDescription5=القيود الأخرى القائمة في إدارة اختياري البارامترات.
// STOP - Lines generated via autotranslator.php tool (2009-08-19 21:36:45). // STOP - Lines generated via autotranslator.php tool (2009-08-19 21:36:45).

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

@ -565,16 +565,16 @@ DelayBeforeWarning=Viive ennen varoitus
DelaysBeforeWarning=Viivästykset ennen varoitus DelaysBeforeWarning=Viivästykset ennen varoitus
DelaysOfToleranceBeforeWarning=Suvaitsevaisuus viivästyksellä ennen varoitus DelaysOfToleranceBeforeWarning=Suvaitsevaisuus viivästyksellä ennen varoitus
DelaysOfToleranceDesc=Tässä näytössä voidaan määrittää siedetty viivästyksiä, ennen kuin hälytys on raportoitu näytön kanssa picto %s kunkin myöhään elementti. DelaysOfToleranceDesc=Tässä näytössä voidaan määrittää siedetty viivästyksiä, ennen kuin hälytys on raportoitu näytön kanssa picto %s kunkin myöhään elementti.
DelaysOfToleranceActionsToDo=Viive toleranssi (päivinä) ennen varoituskynnysten suunnitelluista toimista ei vielä ole Delays_MAIN_DELAY_ACTIONS_TODO=Viive toleranssi (päivinä) ennen varoituskynnysten suunnitelluista toimista ei vielä ole
DelaysOfToleranceOrdersToProcess=Viive toleranssi (päivinä) ennen varoituskynnysten tilauksissa ei ole vielä tehty Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Viive toleranssi (päivinä) ennen varoituskynnysten tilauksissa ei ole vielä tehty
DelaysOfTolerancePropalsToClose=Viive toleranssi (päivinä) ennen varoituskynnysten ehdotuksista lopettaa Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Viive toleranssi (päivinä) ennen varoituskynnysten ehdotuksista lopettaa
DelaysOfTolerancePropalsToBill=Viive toleranssi (päivinä) ennen varoituskynnysten ehdotuksista ei laskuteta Delays_MAIN_DELAY_PROPALS_TO_BILL=Viive toleranssi (päivinä) ennen varoituskynnysten ehdotuksista ei laskuteta
DelaysOfToleranceNotActivatedServices=Suvaitsevaisuus viive (päivinä) ennen varoituskynnysten palveluista aktivoida Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Suvaitsevaisuus viive (päivinä) ennen varoituskynnysten palveluista aktivoida
DelaysOfToleranceRunningServices=Suvaitsevaisuus viive (päivinä) ennen kuin hälytys on lakannut palvelut Delays_MAIN_DELAY_RUNNING_SERVICES=Suvaitsevaisuus viive (päivinä) ennen kuin hälytys on lakannut palvelut
DelaysOfToleranceSupplierBillsToPay=Suvaitsevaisuus viive (päivinä) ennen varoituskynnysten Palkattoman toimittajan laskut Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Suvaitsevaisuus viive (päivinä) ennen varoituskynnysten Palkattoman toimittajan laskut
DelaysOfToleranceCustomerBillsUnpaid=Suvaitsevaisuus viive (päivinä) ennen varoituskynnysten Palkattoman asiakkaan laskut Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Suvaitsevaisuus viive (päivinä) ennen varoituskynnysten Palkattoman asiakkaan laskut
DelaysOfToleranceTransactionsToConciliate=Suvaitsevaisuus viive (päivinä) ennen kuin hälytys on vireillä pankki sovinnon Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Suvaitsevaisuus viive (päivinä) ennen kuin hälytys on vireillä pankki sovinnon
DelaysOfToleranceChequesToDeposit=Suvaitsevaisuus viive (päivinä) ennen varoituksena sekit tallettaa tehdä Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Suvaitsevaisuus viive (päivinä) ennen varoituksena sekit tallettaa tehdä
SetupDescription1=Kaikki parametrit saatavilla asennusohjelma alueella voit setup Dolibarr ennen kuin alkaa käyttää sitä. SetupDescription1=Kaikki parametrit saatavilla asennusohjelma alueella voit setup Dolibarr ennen kuin alkaa käyttää sitä.
SetupDescription4=<b>Moduulit</b> setup on tarpeen, koska Dolibarr ei ole yksinkertainen ERP / CRM mutta summa useita moduuleja, kaikki enemmän tai vähemmän riippumaton. Se on vasta, kun aktivoit modules olet mielenkiintoinen näet ominaisuuksia ilmestyi Dolibarr valikosta. SetupDescription4=<b>Moduulit</b> setup on tarpeen, koska Dolibarr ei ole yksinkertainen ERP / CRM mutta summa useita moduuleja, kaikki enemmän tai vähemmän riippumaton. Se on vasta, kun aktivoit modules olet mielenkiintoinen näet ominaisuuksia ilmestyi Dolibarr valikosta.
EventsSetup=Asennusohjelma tapahtumien lokit EventsSetup=Asennusohjelma tapahtumien lokit
@ -1133,7 +1133,7 @@ DatabaseServer=Tietokannan isäntä
DatabaseUser=Tietokantakäyttäjien DatabaseUser=Tietokantakäyttäjien
DatabasePassword=Tietokannan salasana DatabasePassword=Tietokannan salasana
EnableShowLogo=Show logo vasemmalla valikossa EnableShowLogo=Show logo vasemmalla valikossa
DelaysOfToleranceMembers=Suvaitsevaisuus viive (päivinä) ennen ilmoituksen myöhästymisestä jäsenmaksu Delays_MAIN_DELAY_MEMBERS=Suvaitsevaisuus viive (päivinä) ennen ilmoituksen myöhästymisestä jäsenmaksu
MAIN_ROUNDING_RULE_TOT=Koko pyöristämistä alue (harvinaisia maita, joissa pyöristäminen tapahtuu jotain muuta kuin perusvuonna 10) MAIN_ROUNDING_RULE_TOT=Koko pyöristämistä alue (harvinaisia maita, joissa pyöristäminen tapahtuu jotain muuta kuin perusvuonna 10)
UnitPriceOfProduct=Net yksikköhinta tuotteen UnitPriceOfProduct=Net yksikköhinta tuotteen
TotalPriceAfterRounding=Kokonaishinta (netto / vat / sis. alv) pyöristämisen jälkeen TotalPriceAfterRounding=Kokonaishinta (netto / vat / sis. alv) pyöristämisen jälkeen
@ -1255,7 +1255,7 @@ DictionnarySource=Alkuperä ehdotusten / tilaukset
MenuSmartphoneManager=Smartphone valikonhallinta MenuSmartphoneManager=Smartphone valikonhallinta
DefaultMenuManager=Standard valikonhallinta DefaultMenuManager=Standard valikonhallinta
DefaultMenuSmartphoneManager=Smartphone valikonhallinta DefaultMenuSmartphoneManager=Smartphone valikonhallinta
DelaysOfToleranceSuppliersOrdersToProcess=Viive toleranssi (päivinä) ennen ilmoituksen toimittajille tilauksia ei ole vielä käsitelty Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Viive toleranssi (päivinä) ennen ilmoituksen toimittajille tilauksia ei ole vielä käsitelty
SecurityEventsPurged=Turvallisuus tapahtumia puhdistettava SecurityEventsPurged=Turvallisuus tapahtumia puhdistettava
ShowProfIdInAddress=Näytä ammattijärjestöt id osoitteiden kanssa asiakirjojen ShowProfIdInAddress=Näytä ammattijärjestöt id osoitteiden kanssa asiakirjojen
TranslationUncomplete=Osittainen käännös TranslationUncomplete=Osittainen käännös

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

@ -787,18 +787,18 @@ DelayBeforeWarning= Délai avant alerte
DelaysBeforeWarning= Délais avant alerte DelaysBeforeWarning= Délais avant alerte
DelaysOfToleranceBeforeWarning= Délais de tolérance avant alerte DelaysOfToleranceBeforeWarning= Délais de tolérance avant alerte
DelaysOfToleranceDesc= Cet écran permet de définir les délais de tolérance après lesquels une alerte sera signalée à l'écran par le picto %s, sur chaque élément en retard. DelaysOfToleranceDesc= Cet écran permet de définir les délais de tolérance après lesquels une alerte sera signalée à l'écran par le picto %s, sur chaque élément en retard.
DelaysOfToleranceActionsToDo= Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées Delays_MAIN_DELAY_ACTIONS_TODO= Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées
DelaysOfToleranceOrdersToProcess= Tolérance de retard avant alerte (en jours) sur commandes clients non traitées Delays_MAIN_DELAY_ORDERS_TO_PROCESS= Tolérance de retard avant alerte (en jours) sur commandes clients non traitées
DelaysOfToleranceSuppliersOrdersToProcess= Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS= Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées
DelaysOfTolerancePropalsToClose= Tolérance de retard avant alerte (en jours) sur propales à cloturer Delays_MAIN_DELAY_PROPALS_TO_CLOSE= Tolérance de retard avant alerte (en jours) sur propales à cloturer
DelaysOfTolerancePropalsToBill= Tolérance de retard avant alerte (en jours) sur propales non facturées Delays_MAIN_DELAY_PROPALS_TO_BILL= Tolérance de retard avant alerte (en jours) sur propales non facturées
DelaysOfToleranceNotActivatedServices= Tolérance de retard avant alerte (en jours) sur services à activer Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES= Tolérance de retard avant alerte (en jours) sur services à activer
DelaysOfToleranceRunningServices= Tolérance de retard avant alerte (en jours) sur services expirés Delays_MAIN_DELAY_RUNNING_SERVICES= Tolérance de retard avant alerte (en jours) sur services expirés
DelaysOfToleranceSupplierBillsToPay= Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY= Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées
DelaysOfToleranceCustomerBillsUnpaid= Tolérance de retard avant alerte (en jours) sur factures client impayées Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED= Tolérance de retard avant alerte (en jours) sur factures client impayées
DelaysOfToleranceTransactionsToConciliate= Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE= Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire
DelaysOfToleranceMembers= Tolérance de retard avant alerte (en jours) sur cotisations adhérents en retard Delays_MAIN_DELAY_MEMBERS= Tolérance de retard avant alerte (en jours) sur cotisations adhérents en retard
DelaysOfToleranceChequesToDeposit= Tolérance de retard avant alerte (en jours) sur chèques à déposer Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT= Tolérance de retard avant alerte (en jours) sur chèques à déposer
SetupDescription1= Toutes les options de l'espace configuration sont des options permettant de configurer Dolibarr avant de commencer son utilisation. SetupDescription1= Toutes les options de l'espace configuration sont des options permettant de configurer Dolibarr avant de commencer son utilisation.
SetupDescription2= Les 2 étapes indispensables de configuration sont les 2 premières dans le menu gauche, à savoir, la configuration de la société/institution et la configuration des modules: SetupDescription2= Les 2 étapes indispensables de configuration sont les 2 premières dans le menu gauche, à savoir, la configuration de la société/institution et la configuration des modules:
SetupDescription3= Les données du menu <b>Configuration -> Société/institution</b> sont requises car les informations saisies sont utilisées dans la plupart des écrans, en affichage, ou pour modifier le comportement de Dolibarr (comme par exemple des fonctions qui dépendent de votre pays). SetupDescription3= Les données du menu <b>Configuration -> Société/institution</b> sont requises car les informations saisies sont utilisées dans la plupart des écrans, en affichage, ou pour modifier le comportement de Dolibarr (comme par exemple des fonctions qui dépendent de votre pays).

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

@ -776,18 +776,18 @@ DelayBeforeWarning=עיכוב לפני אזהרה
DelaysBeforeWarning=עיכובים לפני אזהרה DelaysBeforeWarning=עיכובים לפני אזהרה
DelaysOfToleranceBeforeWarning=סובלנות עיכובים לפני אזהרה DelaysOfToleranceBeforeWarning=סובלנות עיכובים לפני אזהרה
DelaysOfToleranceDesc=מסך זה מאפשר לך להגדיר את העיכובים נסבל לפני התראה מדווח על המסך עם %s picto עבור כל רכיב מאוחר. DelaysOfToleranceDesc=מסך זה מאפשר לך להגדיר את העיכובים נסבל לפני התראה מדווח על המסך עם %s picto עבור כל רכיב מאוחר.
DelaysOfToleranceActionsToDo=סובלנות עיכוב (בימים) לפני התראה על אירועים מתוכננים שטרם Delays_MAIN_DELAY_ACTIONS_TODO=סובלנות עיכוב (בימים) לפני התראה על אירועים מתוכננים שטרם
DelaysOfToleranceOrdersToProcess=סובלנות עיכוב (בימים) לפני התראה על הזמנות לא מעובד עדיין Delays_MAIN_DELAY_ORDERS_TO_PROCESS=סובלנות עיכוב (בימים) לפני התראה על הזמנות לא מעובד עדיין
DelaysOfToleranceSuppliersOrdersToProcess=סובלנות עיכוב (בימים) לפני התראה על הזמנות ספקים לא מעובד עדיין Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=סובלנות עיכוב (בימים) לפני התראה על הזמנות ספקים לא מעובד עדיין
DelaysOfTolerancePropalsToClose=סובלנות עיכוב (בימים) לפני התראה על הצעות לסגור Delays_MAIN_DELAY_PROPALS_TO_CLOSE=סובלנות עיכוב (בימים) לפני התראה על הצעות לסגור
DelaysOfTolerancePropalsToBill=סובלנות עיכוב (בימים) לפני התראה על הצעות לא מחויב Delays_MAIN_DELAY_PROPALS_TO_BILL=סובלנות עיכוב (בימים) לפני התראה על הצעות לא מחויב
DelaysOfToleranceNotActivatedServices=עיכוב סובלנות (בימים) לפני התראה על שירותי להפעיל Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=עיכוב סובלנות (בימים) לפני התראה על שירותי להפעיל
DelaysOfToleranceRunningServices=עיכוב סובלנות (בימים) לפני התראה על שירותי פג Delays_MAIN_DELAY_RUNNING_SERVICES=עיכוב סובלנות (בימים) לפני התראה על שירותי פג
DelaysOfToleranceSupplierBillsToPay=עיכוב סובלנות (בימים) לפני התראה על חשבוניות ספקים שלא שולמו Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=עיכוב סובלנות (בימים) לפני התראה על חשבוניות ספקים שלא שולמו
DelaysOfToleranceCustomerBillsUnpaid=עיכוב Tolerence (בימים) לפני התראה על חשבוניות הלקוח ללא תשלום Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=עיכוב Tolerence (בימים) לפני התראה על חשבוניות הלקוח ללא תשלום
DelaysOfToleranceTransactionsToConciliate=עיכוב סובלנות (בימים) לפני התראה על פיוס הבנק תלויה ועומדת Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=עיכוב סובלנות (בימים) לפני התראה על פיוס הבנק תלויה ועומדת
DelaysOfToleranceMembers=עיכוב סובלנות (בימים) לפני התראה על דמי חבר מאוחרת Delays_MAIN_DELAY_MEMBERS=עיכוב סובלנות (בימים) לפני התראה על דמי חבר מאוחרת
DelaysOfToleranceChequesToDeposit=עיכוב סובלנות (בימים) לפני התראה על הפקדת המחאות לעשות Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=עיכוב סובלנות (בימים) לפני התראה על הפקדת המחאות לעשות
SetupDescription1=כל הפרמטרים הזמינים באזור ההתקנה מאפשרת לך להגדיר Dolibarr לפני תחילת השימוש בו. SetupDescription1=כל הפרמטרים הזמינים באזור ההתקנה מאפשרת לך להגדיר Dolibarr לפני תחילת השימוש בו.
SetupDescription2=2 שלבי ההתקנה החשובים ביותר הם 2 הראשונים בתפריט ההתקנה שמאל, זו החברה / הקרן באמצעות דף הגדרות מודולים דף הגדרות: SetupDescription2=2 שלבי ההתקנה החשובים ביותר הם 2 הראשונים בתפריט ההתקנה שמאל, זו החברה / הקרן באמצעות דף הגדרות מודולים דף הגדרות:
SetupDescription3=פרמטרים של <b>הגדרת</b> תפריט <b>-&gt; החברה / קרן</b> נדרשים כי המידע קלט משמש מציג Dolibarr ולשנות התנהגות Dolibarr (למשל עבור תכונות הקשורות למדינה שלך). SetupDescription3=פרמטרים של <b>הגדרת</b> תפריט <b>-&gt; החברה / קרן</b> נדרשים כי המידע קלט משמש מציג Dolibarr ולשנות התנהגות Dolibarr (למשל עבור תכונות הקשורות למדינה שלך).

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

@ -776,18 +776,18 @@ DelayBeforeWarning=Késleltetett előtt figyelmeztetés
DelaysBeforeWarning=Késéssel figyelmeztetés DelaysBeforeWarning=Késéssel figyelmeztetés
DelaysOfToleranceBeforeWarning=Tolerancia késéssel figyelmeztetés DelaysOfToleranceBeforeWarning=Tolerancia késéssel figyelmeztetés
DelaysOfToleranceDesc=Ez a képernyő lehetővé teszi, hogy meghatározza a tolerálható késéssel riasztást jelentett a képernyőn Picto %s minden késedelmes elem. DelaysOfToleranceDesc=Ez a képernyő lehetővé teszi, hogy meghatározza a tolerálható késéssel riasztást jelentett a képernyőn Picto %s minden késedelmes elem.
DelaysOfToleranceActionsToDo=Késleltetés tolerancia (napokban), mielőtt a tervezett események figyelmeztető jelzés még nem valósult Delays_MAIN_DELAY_ACTIONS_TODO=Késleltetés tolerancia (napokban), mielőtt a tervezett események figyelmeztető jelzés még nem valósult
DelaysOfToleranceOrdersToProcess=Késleltetés tolerancia (napokban), mielőtt riasztást megrendelések még nincs feldolgozva Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Késleltetés tolerancia (napokban), mielőtt riasztást megrendelések még nincs feldolgozva
DelaysOfToleranceSuppliersOrdersToProcess=Késleltetés tolerancia (napokban), mielőtt riasztást szállítók megrendelések még nincs feldolgozva Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Késleltetés tolerancia (napokban), mielőtt riasztást szállítók megrendelések még nincs feldolgozva
DelaysOfTolerancePropalsToClose=Késleltetés tolerancia (napokban), mielőtt riasztást javaslatokat, hogy lezárja Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Késleltetés tolerancia (napokban), mielőtt riasztást javaslatokat, hogy lezárja
DelaysOfTolerancePropalsToBill=Késleltetés tolerancia (napokban), mielőtt riasztást javaslatok nem kell fizetnie Delays_MAIN_DELAY_PROPALS_TO_BILL=Késleltetés tolerancia (napokban), mielőtt riasztást javaslatok nem kell fizetnie
DelaysOfToleranceNotActivatedServices=Tolerancia késleltetést (nap) előtt figyelmeztető szolgáltatások aktiválásához Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerancia késleltetést (nap) előtt figyelmeztető szolgáltatások aktiválásához
DelaysOfToleranceRunningServices=Tolerancia késleltetést (nap) előtt figyelmeztető jelzés hatálya lejárt szolgáltatások Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerancia késleltetést (nap) előtt figyelmeztető jelzés hatálya lejárt szolgáltatások
DelaysOfToleranceSupplierBillsToPay=Tolerancia késleltetést (nap) előtt figyelmeztető jelzés nem fizetett szállító számlák Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerancia késleltetést (nap) előtt figyelmeztető jelzés nem fizetett szállító számlák
DelaysOfToleranceCustomerBillsUnpaid=Tolerence késleltetést (nap) előtt figyelmeztető fizetés nélküli ügyfél számlák Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence késleltetést (nap) előtt figyelmeztető fizetés nélküli ügyfél számlák
DelaysOfToleranceTransactionsToConciliate=Tolerancia késleltetést (nap) előtt folyamatban lévő figyelmeztető banki megbékélés Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerancia késleltetést (nap) előtt folyamatban lévő figyelmeztető banki megbékélés
DelaysOfToleranceMembers=Tolerancia késleltetést (nap) előtt figyelmeztető jelzés késedelmes tagdíj Delays_MAIN_DELAY_MEMBERS=Tolerancia késleltetést (nap) előtt figyelmeztető jelzés késedelmes tagdíj
DelaysOfToleranceChequesToDeposit=Tolerancia késedelem (nap) előtt figyelmeztetést ellenőrzések betét csinálni Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancia késedelem (nap) előtt figyelmeztetést ellenőrzések betét csinálni
SetupDescription1=Minden paraméter elérhető a setup területen lehetővé teszi, hogy beállít Dolibarr megkezdése előtt használja. SetupDescription1=Minden paraméter elérhető a setup területen lehetővé teszi, hogy beállít Dolibarr megkezdése előtt használja.
SetupDescription2=A 2 legfontosabb beállítási lépések a 2 elsők a bal oldali setup menüben, ez azt jelenti cég / alapítvány oldalt és modulok beállítási oldalon: SetupDescription2=A 2 legfontosabb beállítási lépések a 2 elsők a bal oldali setup menüben, ez azt jelenti cég / alapítvány oldalt és modulok beállítási oldalon:
SetupDescription3=Paraméterek menüben <b>Setup -&gt; Company / alapítvány</b> van szükség, mert bemeneti adatokat használnak Dolibarr kijelzők és módosítani Dolibarr magatartás (például a szolgáltatások kapcsolódnak az ország). SetupDescription3=Paraméterek menüben <b>Setup -&gt; Company / alapítvány</b> van szükség, mert bemeneti adatokat használnak Dolibarr kijelzők és módosítani Dolibarr magatartás (például a szolgáltatások kapcsolódnak az ország).

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

@ -700,17 +700,17 @@ DelayBeforeWarning=Töf áður viðvörun
DelaysBeforeWarning=Tafir fyrir viðvörun DelaysBeforeWarning=Tafir fyrir viðvörun
DelaysOfToleranceBeforeWarning=Umburðarlyndi tafir fyrir viðvörun DelaysOfToleranceBeforeWarning=Umburðarlyndi tafir fyrir viðvörun
DelaysOfToleranceDesc=Þessi skjár gerir þér kleift að tilgreina þola tafir áður en viðvörun er greint á skjá með picto %s fyrir hvern seint í lotukerfinu. DelaysOfToleranceDesc=Þessi skjár gerir þér kleift að tilgreina þola tafir áður en viðvörun er greint á skjá með picto %s fyrir hvern seint í lotukerfinu.
DelaysOfToleranceActionsToDo=Töf umburðarlyndi (í dögum) áður en viðvörun um fyrirhugaðar aðgerðir ekki enn grein Delays_MAIN_DELAY_ACTIONS_TODO=Töf umburðarlyndi (í dögum) áður en viðvörun um fyrirhugaðar aðgerðir ekki enn grein
DelaysOfToleranceOrdersToProcess=Töf umburðarlyndi (í dögum) áður en hann hringi á skipunum enn ekki gert Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Töf umburðarlyndi (í dögum) áður en hann hringi á skipunum enn ekki gert
DelaysOfTolerancePropalsToClose=Töf umburðarlyndi (í dögum) áður en viðvörun um tillögur til að loka Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Töf umburðarlyndi (í dögum) áður en viðvörun um tillögur til að loka
DelaysOfTolerancePropalsToBill=Töf umburðarlyndi (í dögum) áður en viðvörun um tillögur billed ekki Delays_MAIN_DELAY_PROPALS_TO_BILL=Töf umburðarlyndi (í dögum) áður en viðvörun um tillögur billed ekki
DelaysOfToleranceNotActivatedServices=Umburðarlyndi töf (í dögum) áður en hann hringi á þjónusta að virkja Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Umburðarlyndi töf (í dögum) áður en hann hringi á þjónusta að virkja
DelaysOfToleranceRunningServices=Umburðarlyndi töf (í dögum) áður en hann hringi á útrunnið þjónusta Delays_MAIN_DELAY_RUNNING_SERVICES=Umburðarlyndi töf (í dögum) áður en hann hringi á útrunnið þjónusta
DelaysOfToleranceSupplierBillsToPay=Umburðarlyndi töf (í dögum) áður en hann hringi á ógreiddum reikningum birgir Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Umburðarlyndi töf (í dögum) áður en hann hringi á ógreiddum reikningum birgir
DelaysOfToleranceCustomerBillsUnpaid=Umburðarlyndi töf (í dögum) áður en hann hringi á ógreiddum reikningum viðskiptavina Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Umburðarlyndi töf (í dögum) áður en hann hringi á ógreiddum reikningum viðskiptavina
DelaysOfToleranceTransactionsToConciliate=Umburðarlyndi töf (í dögum) áður en viðvörun um yfirvofandi banka sættir Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Umburðarlyndi töf (í dögum) áður en viðvörun um yfirvofandi banka sættir
DelaysOfToleranceMembers=Umburðarlyndi töf (í dögum) áður en viðvörun um seinkun Félagsgjaldið Delays_MAIN_DELAY_MEMBERS=Umburðarlyndi töf (í dögum) áður en viðvörun um seinkun Félagsgjaldið
DelaysOfToleranceChequesToDeposit=Umburðarlyndi töf (í dögum) áður en vakandi fyrir eftirlit leggja inn til að gera Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Umburðarlyndi töf (í dögum) áður en vakandi fyrir eftirlit leggja inn til að gera
SetupDescription1=Allar breytur eru í skipulag svæðisins leyfa þér að skipulag Dolibarr áður en þú byrjar að nota það. SetupDescription1=Allar breytur eru í skipulag svæðisins leyfa þér að skipulag Dolibarr áður en þú byrjar að nota það.
SetupDescription2=The 2 mikilvægustu skipulag skref eru 2 fyrstu í vinstri skipulag matseðill, þetta þýðir að fyrirtæki / stofnun skipulag síðu og mát skipulag síðu: SetupDescription2=The 2 mikilvægustu skipulag skref eru 2 fyrstu í vinstri skipulag matseðill, þetta þýðir að fyrirtæki / stofnun skipulag síðu og mát skipulag síðu:
SetupDescription3=Breytur í valmyndinni <b>Skipulag -> Fyrirtæki / stofnun</b> eru nauðsynlegar vegna þess að inntak upplýsinga er notaður á Dolibarr sýna og breyta Dolibarr hegðun (td fyrir aðgerðir sem tengjast þínu landi). SetupDescription3=Breytur í valmyndinni <b>Skipulag -> Fyrirtæki / stofnun</b> eru nauðsynlegar vegna þess að inntak upplýsinga er notaður á Dolibarr sýna og breyta Dolibarr hegðun (td fyrir aðgerðir sem tengjast þínu landi).
@ -1244,7 +1244,7 @@ DictionnarySource=Uppruni tillögur / pantanir
MenuSmartphoneManager=Smartphone matseðill framkvæmdastjóri MenuSmartphoneManager=Smartphone matseðill framkvæmdastjóri
DefaultMenuManager=Standard matseðill framkvæmdastjóri DefaultMenuManager=Standard matseðill framkvæmdastjóri
DefaultMenuSmartphoneManager=Smartphone matseðill framkvæmdastjóri DefaultMenuSmartphoneManager=Smartphone matseðill framkvæmdastjóri
DelaysOfToleranceSuppliersOrdersToProcess=Töf umburðarlyndi (í dögum) fyrir viðvörun um birgja pantanir ekki enn unnum Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Töf umburðarlyndi (í dögum) fyrir viðvörun um birgja pantanir ekki enn unnum
SecurityEventsPurged=Öryggi viðburðir hreinsa SecurityEventsPurged=Öryggi viðburðir hreinsa
ShowProfIdInAddress=Sýna professionnal persónuskilríki með heimilisföng á skjölum ShowProfIdInAddress=Sýna professionnal persónuskilríki með heimilisföng á skjölum
TranslationUncomplete=Algjör þýðing TranslationUncomplete=Algjör þýðing

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

@ -168,20 +168,20 @@ DefineHereComplementaryAttributes =Definire qui tutti gli attributi non p
DelayBeforeWarning =Ritardo prima di avvertire DelayBeforeWarning =Ritardo prima di avvertire
DelayedInsert =Inserimento differito DelayedInsert =Inserimento differito
DelaysBeforeWarning =Ritardi prima di avvertire DelaysBeforeWarning =Ritardi prima di avvertire
DelaysOfToleranceActionsToDo =Tolleranza sul ritardo (in giorni) prima di un avvertimento per azioni pianificate non ancora realizzate Delays_MAIN_DELAY_ACTIONS_TODO =Tolleranza sul ritardo (in giorni) prima di un avvertimento per azioni pianificate non ancora realizzate
DelaysOfToleranceBeforeWarning =Tolleranza sui ritardi prima di un avvertimento DelaysOfToleranceBeforeWarning =Tolleranza sui ritardi prima di un avvertimento
DelaysOfToleranceChequesToDeposit =Tolleranza sul ritardo (in giorni) prima un avvertimento per deposito di assegni da fare Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT =Tolleranza sul ritardo (in giorni) prima un avvertimento per deposito di assegni da fare
DelaysOfToleranceCustomerBillsUnpaid =Tolleranza sul ritardo (in giorni) prima di un avvertimento per fatture attive non pagate Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED =Tolleranza sul ritardo (in giorni) prima di un avvertimento per fatture attive non pagate
DelaysOfToleranceDesc =Questa schermata consente di definire per ciascun elemento la tolleranza sul ritardo prima che appaia una segnalazione nella casella con l'immagine %s. DelaysOfToleranceDesc =Questa schermata consente di definire per ciascun elemento la tolleranza sul ritardo prima che appaia una segnalazione nella casella con l'immagine %s.
DelaysOfToleranceMembers =Tolleranza sul ritardo (in giorni) prima di un avvertimento per quota di adesione ritardata Delays_MAIN_DELAY_MEMBERS =Tolleranza sul ritardo (in giorni) prima di un avvertimento per quota di adesione ritardata
DelaysOfToleranceNotActivatedServices =Tolleranza sul ritardo (in giorni) prima di un avvertimento per servizi da attivare Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES =Tolleranza sul ritardo (in giorni) prima di un avvertimento per servizi da attivare
DelaysOfToleranceOrdersToProcess =Tolleranza sul ritardo (in giorni) prima di un avvertimento per ordini non ancora lavorati Delays_MAIN_DELAY_ORDERS_TO_PROCESS =Tolleranza sul ritardo (in giorni) prima di un avvertimento per ordini non ancora lavorati
DelaysOfTolerancePropalsToBill =Tolleranza sul ritardo (in giorni) prima di un avvertimento per proposte non fatturate Delays_MAIN_DELAY_PROPALS_TO_BILL =Tolleranza sul ritardo (in giorni) prima di un avvertimento per proposte non fatturate
DelaysOfTolerancePropalsToClose =Tolleranza sul ritardo (in giorni) prima di un avvertimento per proposte da chiudere Delays_MAIN_DELAY_PROPALS_TO_CLOSE =Tolleranza sul ritardo (in giorni) prima di un avvertimento per proposte da chiudere
DelaysOfToleranceRunningServices =Tolleranza sul ritardo (in giorni) prima di un avvertimento per servizi scaduti Delays_MAIN_DELAY_RUNNING_SERVICES =Tolleranza sul ritardo (in giorni) prima di un avvertimento per servizi scaduti
DelaysOfToleranceSupplierBillsToPay =Tolleranza sul ritardo (in giorni) prima di un avvertimento per fatture dei fornitori non pagate Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY =Tolleranza sul ritardo (in giorni) prima di un avvertimento per fatture dei fornitori non pagate
DelaysOfToleranceSuppliersOrdersToProcess =Tolleranza sul ritardo (in giorni) prima di un avvertimento per ordini fornitore non ancora elaborati Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS =Tolleranza sul ritardo (in giorni) prima di un avvertimento per ordini fornitore non ancora elaborati
DelaysOfToleranceTransactionsToConciliate =Tolleranza sul ritardo (in giorni) prima di un avvertimento per movimenti bancari in attesa di riconciliazione Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE =Tolleranza sul ritardo (in giorni) prima di un avvertimento per movimenti bancari in attesa di riconciliazione
Delays =Ritardi Delays =Ritardi
DeleteLine =Elimina riga DeleteLine =Elimina riga
DeleteMenu =Elimina voce menu DeleteMenu =Elimina voce menu

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

@ -776,18 +776,18 @@ DelayBeforeWarning=警告前の遅延
DelaysBeforeWarning=警告の前に遅延 DelaysBeforeWarning=警告の前に遅延
DelaysOfToleranceBeforeWarning=許容遅延の前に警告 DelaysOfToleranceBeforeWarning=許容遅延の前に警告
DelaysOfToleranceDesc=アラートは、各年代後半要素のピクトの%sと画面上に報告される前に、この画面では、許容遅延を定義することができます。 DelaysOfToleranceDesc=アラートは、各年代後半要素のピクトの%sと画面上に報告される前に、この画面では、許容遅延を定義することができます。
DelaysOfToleranceActionsToDo=まだ実現していない計画的なイベントに関する警告の前に遅延の許容範囲（日） Delays_MAIN_DELAY_ACTIONS_TODO=まだ実現していない計画的なイベントに関する警告の前に遅延の許容範囲（日）
DelaysOfToleranceOrdersToProcess=まだ処理されていない受注のアラートの前に遅延の許容範囲（日） Delays_MAIN_DELAY_ORDERS_TO_PROCESS=まだ処理されていない受注のアラートの前に遅延の許容範囲（日）
DelaysOfToleranceSuppliersOrdersToProcess=まだ処理されていない業者の受注に警告するまでの遅延時間の許容範囲（日） Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=まだ処理されていない業者の受注に警告するまでの遅延時間の許容範囲（日）
DelaysOfTolerancePropalsToClose=閉じるには、提案について警告する前に許容差（日数）を遅らせる Delays_MAIN_DELAY_PROPALS_TO_CLOSE=閉じるには、提案について警告する前に許容差（日数）を遅らせる
DelaysOfTolerancePropalsToBill=請求しない提案について警告する前に許容差（日数）を遅らせる Delays_MAIN_DELAY_PROPALS_TO_BILL=請求しない提案について警告する前に許容差（日数）を遅らせる
DelaysOfToleranceNotActivatedServices=アクティブにするサービスのアラートの前に許容遅延時間（日数） Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=アクティブにするサービスのアラートの前に許容遅延時間（日数）
DelaysOfToleranceRunningServices=期限切れのサービスに関するアラートの前に許容遅延時間（日数） Delays_MAIN_DELAY_RUNNING_SERVICES=期限切れのサービスに関するアラートの前に許容遅延時間（日数）
DelaysOfToleranceSupplierBillsToPay=未払いの仕入先請求書の警告の前に許容遅延時間（日数） Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=未払いの仕入先請求書の警告の前に許容遅延時間（日数）
DelaysOfToleranceCustomerBillsUnpaid=未払いのクライアントの請求書のアラートの前にTolerence遅延（日数） Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=未払いのクライアントの請求書のアラートの前にTolerence遅延（日数）
DelaysOfToleranceTransactionsToConciliate=保留中の銀行の和解に警告する前に、許容遅延時間（日数） Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=保留中の銀行の和解に警告する前に、許容遅延時間（日数）
DelaysOfToleranceMembers=遅延会費のアラートの前に許容遅延時間（日数） Delays_MAIN_DELAY_MEMBERS=遅延会費のアラートの前に許容遅延時間（日数）
DelaysOfToleranceChequesToDeposit=行うためのチェック預金のアラートの前に許容遅延時間（日数） Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=行うためのチェック預金のアラートの前に許容遅延時間（日数）
SetupDescription1=セットアップ領域で使用可能なすべてのパラメータは、あなたがそれを使用する前に、必ずDolibarrを設定することができます。 SetupDescription1=セットアップ領域で使用可能なすべてのパラメータは、あなたがそれを使用する前に、必ずDolibarrを設定することができます。
SetupDescription2=2最も重要な設定手順は、左のセットアップメニューは、この手段会社/基礎のセットアップページとモジュールの設定ページで2最初のものは次のとおりです。 SetupDescription2=2最も重要な設定手順は、左のセットアップメニューは、この手段会社/基礎のセットアップページとモジュールの設定ページで2最初のものは次のとおりです。
SetupDescription3=メニューの<b>設定</b>のパラメータは、 <b>-</b>入力情報はDolibarrのディスプレイに使用されているため<b>、&gt;会社概要/基礎が</b>必要とされ、（あなたの国に関連した機能の例）Dolibarrの動作を変更する。 SetupDescription3=メニューの<b>設定</b>のパラメータは、 <b>-</b>入力情報はDolibarrのディスプレイに使用されているため<b>、&gt;会社概要/基礎が</b>必要とされ、（あなたの国に関連した機能の例）Dolibarrの動作を変更する。

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

@ -563,17 +563,17 @@ DelayBeforeWarning=Forsinkelse før varsling
DelaysBeforeWarning=Forsinkelser før varsling DelaysBeforeWarning=Forsinkelser før varsling
DelaysOfToleranceBeforeWarning=Toleranseforsikelse før varsling DelaysOfToleranceBeforeWarning=Toleranseforsikelse før varsling
DelaysOfToleranceDesc=Denne siden lar deg angi antall 'toleransedager' du ønsker før en forsinkelse skal varsles på skjermen med ikonet %s for hvert forsinkede element. DelaysOfToleranceDesc=Denne siden lar deg angi antall 'toleransedager' du ønsker før en forsinkelse skal varsles på skjermen med ikonet %s for hvert forsinkede element.
DelaysOfToleranceActionsToDo=Forinkelstoleranse (i dager) før varsel om planlage handlinger som ikke er utført Delays_MAIN_DELAY_ACTIONS_TODO=Forinkelstoleranse (i dager) før varsel om planlage handlinger som ikke er utført
DelaysOfToleranceOrdersToProcess=Forsinkelsestoleranse (i dager) før varsel om ordrer ikke levert Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Forsinkelsestoleranse (i dager) før varsel om ordrer ikke levert
DelaysOfTolerancePropalsToClose=Forsinkelsestoleranse (i dager) før varsel om tilbud som ikke er lukket Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Forsinkelsestoleranse (i dager) før varsel om tilbud som ikke er lukket
DelaysOfTolerancePropalsToBill=Forsinkelsestoleranse (i dager) før varsel om tilbud som ikke er fakturert Delays_MAIN_DELAY_PROPALS_TO_BILL=Forsinkelsestoleranse (i dager) før varsel om tilbud som ikke er fakturert
DelaysOfToleranceNotActivatedServices=Forsinkelsestoleranse (i dager) før varsel om tjenester som ikke er aktivert Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Forsinkelsestoleranse (i dager) før varsel om tjenester som ikke er aktivert
DelaysOfToleranceRunningServices=Forsinkelsestoleranse (i dager) før varsel om utløpte tjenester Delays_MAIN_DELAY_RUNNING_SERVICES=Forsinkelsestoleranse (i dager) før varsel om utløpte tjenester
DelaysOfToleranceSupplierBillsToPay=Forsinkelsestoleranse (i dager) før varsel om ubetalte leverandørfakturaer Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Forsinkelsestoleranse (i dager) før varsel om ubetalte leverandørfakturaer
DelaysOfToleranceCustomerBillsUnpaid=Forsinkelsestoleranse (i dager) før varsel om ubetalte kundefakturaer Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Forsinkelsestoleranse (i dager) før varsel om ubetalte kundefakturaer
DelaysOfToleranceTransactionsToConciliate=Forsinkelsestoleranse (i dager) før varsel om forfalt bankavstemming Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Forsinkelsestoleranse (i dager) før varsel om forfalt bankavstemming
DelaysOfToleranceMembers=Forsinkelsestoleranse (i dager) før varsel om forsinket medlemskontingent Delays_MAIN_DELAY_MEMBERS=Forsinkelsestoleranse (i dager) før varsel om forsinket medlemskontingent
DelaysOfToleranceChequesToDeposit=Forsinkelsestoleranse (i dager) før varsel om sjekker som må settes inn i bank Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Forsinkelsestoleranse (i dager) før varsel om sjekker som må settes inn i bank
SetupDescription1=Alle muligheterene under innstillinger lar deg sette opp Dolibarr etter dine behov, før du begynner å bruke programmet. SetupDescription1=Alle muligheterene under innstillinger lar deg sette opp Dolibarr etter dine behov, før du begynner å bruke programmet.
SetupDescription2=De to viktigste trinnene er de to første i menyen til venstre: Det vil si Firma/organisasjon og Moduler: SetupDescription2=De to viktigste trinnene er de to første i menyen til venstre: Det vil si Firma/organisasjon og Moduler:
SetupDescription3=<b>Firma/organisasjon</b> er viktig fordi informasjonen her styrer mange av funkjonene i Dolibarr (for eksempel funksjoner som påvirkes av det landet du er i). SetupDescription3=<b>Firma/organisasjon</b> er viktig fordi informasjonen her styrer mange av funkjonene i Dolibarr (for eksempel funksjoner som påvirkes av det landet du er i).
@ -1272,7 +1272,7 @@ DictionnarySource=Origin of forslag / pålegg
MenuSmartphoneManager=Smartphone-menyen leder MenuSmartphoneManager=Smartphone-menyen leder
DefaultMenuManager=Standard meny leder DefaultMenuManager=Standard meny leder
DefaultMenuSmartphoneManager=Smartphone-menyen leder DefaultMenuSmartphoneManager=Smartphone-menyen leder
DelaysOfToleranceSuppliersOrdersToProcess=Forsinkelse toleranse (i dager) før varsel på leverandørers ordre ennå ikke behandlet Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Forsinkelse toleranse (i dager) før varsel på leverandørers ordre ennå ikke behandlet
SecurityEventsPurged=Sikkerhetshendelser renset SecurityEventsPurged=Sikkerhetshendelser renset
ShowProfIdInAddress=Vis Profesjonell id med adresser på dokumenter ShowProfIdInAddress=Vis Profesjonell id med adresser på dokumenter
TranslationUncomplete=Delvis oversettelse TranslationUncomplete=Delvis oversettelse

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

@ -560,16 +560,16 @@ DelayBeforeWarning=Vertraging voor waarschuwing
DelaysBeforeWarning=Vertragingen voor waarschuwing DelaysBeforeWarning=Vertragingen voor waarschuwing
DelaysOfToleranceBeforeWarning=Tolerantie vertraging voor waarschuwing DelaysOfToleranceBeforeWarning=Tolerantie vertraging voor waarschuwing
DelaysOfToleranceDesc=In dit scherm kunt u de tijd vóór tolerantie bepalen voor er een waarschuwing met het element %s zal worden weergegeven. DelaysOfToleranceDesc=In dit scherm kunt u de tijd vóór tolerantie bepalen voor er een waarschuwing met het element %s zal worden weergegeven.
DelaysOfToleranceActionsToDo=Vertraging tolerantie (in dagen) voor waarschuwing over de voorgenomen acties die nog niet zijngerealiseerd Delays_MAIN_DELAY_ACTIONS_TODO=Vertraging tolerantie (in dagen) voor waarschuwing over de voorgenomen acties die nog niet zijngerealiseerd
DelaysOfToleranceOrdersToProcess=Vertraging tolerantie (in dagen) voor waarschuwing op bestellingen die nog niet zijn uitgevoerd Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Vertraging tolerantie (in dagen) voor waarschuwing op bestellingen die nog niet zijn uitgevoerd
DelaysOfTolerancePropalsToClose=Vertraging tolerantie (in dagen) voor waarschuwing op voorstellen nog te sluiten Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Vertraging tolerantie (in dagen) voor waarschuwing op voorstellen nog te sluiten
DelaysOfTolerancePropalsToBill=Vertraging tolerantie (in dagen) voor waarschuwing op voorstellen die nog niet zijn gefactureerd Delays_MAIN_DELAY_PROPALS_TO_BILL=Vertraging tolerantie (in dagen) voor waarschuwing op voorstellen die nog niet zijn gefactureerd
DelaysOfToleranceNotActivatedServices=Tolerantie vertraging (in dagen) voor waarschuwing betreffende diensten te activeren Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerantie vertraging (in dagen) voor waarschuwing betreffende diensten te activeren
DelaysOfToleranceRunningServices=Tolerantie vertraging (in dagen) voor waarschuwing op verstreken diensten Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerantie vertraging (in dagen) voor waarschuwing op verstreken diensten
DelaysOfToleranceSupplierBillsToPay=Tolerantie vertraging (in dagen) voor waarschuwing op onbetaalde facturen van leveranciers Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerantie vertraging (in dagen) voor waarschuwing op onbetaalde facturen van leveranciers
DelaysOfToleranceCustomerBillsUnpaid=Tolerantie vertraging (in dagen) voor waarschuwing op onbetaalde facturen van klanten Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerantie vertraging (in dagen) voor waarschuwing op onbetaalde facturen van klanten
DelaysOfToleranceTransactionsToConciliate=Tolerance delay (in days) before alert on pending bank reconciliation Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
DelaysOfToleranceChequesToDeposit=Tolerantie vertraging (in dagen) voor waarschuwing om cheques neer te leggen Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerantie vertraging (in dagen) voor waarschuwing om cheques neer te leggen
SetupDescription1=Alle parameters die beschikbaar zijn via "Opstelling" kunt u instellen vooraleer u begint met het gebruik van Dolibarr. SetupDescription1=Alle parameters die beschikbaar zijn via "Opstelling" kunt u instellen vooraleer u begint met het gebruik van Dolibarr.
SetupDescription2=De 2 belangrijkste configuratie stappen zijn de eerste 2 in het linker menu "Opstelling", namelijk het instellen van "Bedrijf" en "Modules": SetupDescription2=De 2 belangrijkste configuratie stappen zijn de eerste 2 in het linker menu "Opstelling", namelijk het instellen van "Bedrijf" en "Modules":
SetupDescription3=Configuratie van <b>Bedrijf</b> is nodig omdat de informatie wordt gebruikt op Dolibarr beeldschermen en voor het gedrag van Dolibarr (bijvoorbeeld voor de functies met betrekking tot uw land). SetupDescription3=Configuratie van <b>Bedrijf</b> is nodig omdat de informatie wordt gebruikt op Dolibarr beeldschermen en voor het gedrag van Dolibarr (bijvoorbeeld voor de functies met betrekking tot uw land).

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

@ -743,18 +743,18 @@ DelayBeforeWarning = Vertraging voorafgaande aan kennisgeving
DelaysBeforeWarning = Vertragingen voorafgaande aan kennisgeving DelaysBeforeWarning = Vertragingen voorafgaande aan kennisgeving
DelaysOfToleranceBeforeWarning = Getolereerde vertraging voor kennisgeving DelaysOfToleranceBeforeWarning = Getolereerde vertraging voor kennisgeving
DelaysOfToleranceDesc = In dit scherm kunt u de getolereerde vertraging voordat een kennisgeving wordt gemeld op het scherm met een icoontje %s voor elk te laat element. DelaysOfToleranceDesc = In dit scherm kunt u de getolereerde vertraging voordat een kennisgeving wordt gemeld op het scherm met een icoontje %s voor elk te laat element.
DelaysOfToleranceActionsToDo = Getolereerde vertraging (in dagen) voor de kennisgeving over de nog niet gerealiseerde geplande acties Delays_MAIN_DELAY_ACTIONS_TODO = Getolereerde vertraging (in dagen) voor de kennisgeving over de nog niet gerealiseerde geplande acties
DelaysOfToleranceOrdersToProcess = Getolereerde vertraging (in dagen) voor een kennisgeving, op nog niet uitgevoerde orders word getoond Delays_MAIN_DELAY_ORDERS_TO_PROCESS = Getolereerde vertraging (in dagen) voor een kennisgeving, op nog niet uitgevoerde orders word getoond
DelaysOfToleranceSuppliersOrdersToProcess = Vertragingstoleratie (in dagen) voordat een kennisgeving plaatsvind van nog niet verwerkte leveranciersopdrachten. Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS = Vertragingstoleratie (in dagen) voordat een kennisgeving plaatsvind van nog niet verwerkte leveranciersopdrachten.
DelaysOfTolerancePropalsToClose = Getolereerde vertraging (in dagen) voor een kennisgeving, op af te sluiten offertes word getoond Delays_MAIN_DELAY_PROPALS_TO_CLOSE = Getolereerde vertraging (in dagen) voor een kennisgeving, op af te sluiten offertes word getoond
DelaysOfTolerancePropalsToBill = Getolereerde vertraging (in dagen) voor een kennisgeving, op niet-gefactureerde offertes word getoond Delays_MAIN_DELAY_PROPALS_TO_BILL = Getolereerde vertraging (in dagen) voor een kennisgeving, op niet-gefactureerde offertes word getoond
DelaysOfToleranceNotActivatedServices = Getolereerde vertraging (in dagen) voor een kennisgeving, op te activeren diensten word getoond Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES = Getolereerde vertraging (in dagen) voor een kennisgeving, op te activeren diensten word getoond
DelaysOfToleranceRunningServices = Getolereerde vertraging (in dagen) voor een kennisgeving, op afgelopen diensten word getoond Delays_MAIN_DELAY_RUNNING_SERVICES = Getolereerde vertraging (in dagen) voor een kennisgeving, op afgelopen diensten word getoond
DelaysOfToleranceSupplierBillsToPay = Getolereerde vertraging (in dagen) voor een kennisgeving, op een onbetaalde leveranciersfactuur word getoond Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY = Getolereerde vertraging (in dagen) voor een kennisgeving, op een onbetaalde leveranciersfactuur word getoond
DelaysOfToleranceCustomerBillsUnpaid = Getolereerde vertraging (in dagen) voor een kennisgeving, op een onbetaalde afnemersfactuur word getoond Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED = Getolereerde vertraging (in dagen) voor een kennisgeving, op een onbetaalde afnemersfactuur word getoond
DelaysOfToleranceTransactionsToConciliate = Getolereerde vertraging (in dagen) voor een kennisgeving, op bank conciliatie word getoond Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE = Getolereerde vertraging (in dagen) voor een kennisgeving, op bank conciliatie word getoond
DelaysOfToleranceMembers = Getolereerde vertraging (in dagen) voor een kennisgeving, op niet betaalde contributie word getoond Delays_MAIN_DELAY_MEMBERS = Getolereerde vertraging (in dagen) voor een kennisgeving, op niet betaalde contributie word getoond
DelaysOfToleranceChequesToDeposit = Getolereerde vertraging (in dagen) voor de kennisgeving voor nog te doen cheques aanbetaling Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT = Getolereerde vertraging (in dagen) voor de kennisgeving voor nog te doen cheques aanbetaling
SetupDescription1 = Alle instellingen die beschikbaar zijn in het instellingenscherm kunt u instellen voordat u begint met het gebruik van Dolibarr. SetupDescription1 = Alle instellingen die beschikbaar zijn in het instellingenscherm kunt u instellen voordat u begint met het gebruik van Dolibarr.
SetupDescription2 = De 2 belangrijkste instellingsstappen zijn de 2 eersten uit het linker menu 'Instellingen', dit zijn de 'bedrijf / stiching' instellingenpagina en de 'Modules' pagina: SetupDescription2 = De 2 belangrijkste instellingsstappen zijn de 2 eersten uit het linker menu 'Instellingen', dit zijn de 'bedrijf / stiching' instellingenpagina en de 'Modules' pagina:
SetupDescription3 = De <b>Bedrijf / stichting</b>-instellingen zijn nodig omdat de ingevoerde gegevens worden gebruikt op de Dolibarr schermen en om de werkwijze van Dolibaar aan te passen (bijvoorbeeld functionaliteitafstemming met betrekking tot uw land, of documentengeneratie). SetupDescription3 = De <b>Bedrijf / stichting</b>-instellingen zijn nodig omdat de ingevoerde gegevens worden gebruikt op de Dolibarr schermen en om de werkwijze van Dolibaar aan te passen (bijvoorbeeld functionaliteitafstemming met betrekking tot uw land, of documentengeneratie).

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

@ -567,16 +567,16 @@ DelayBeforeWarning=Opóźnienie ostrzeżenie przed
DelaysBeforeWarning=Opóźnienia ostrzeżenie przed DelaysBeforeWarning=Opóźnienia ostrzeżenie przed
DelaysOfToleranceBeforeWarning=Tolerancja opóźnień ostrzeżenie przed DelaysOfToleranceBeforeWarning=Tolerancja opóźnień ostrzeżenie przed
DelaysOfToleranceDesc=Ten ekran pozwala na określenie dopuszczalnego opóźnienia przed wpisu jest zgłaszane na ekranie z picto %s dla każdego elementu późno. DelaysOfToleranceDesc=Ten ekran pozwala na określenie dopuszczalnego opóźnienia przed wpisu jest zgłaszane na ekranie z picto %s dla każdego elementu późno.
DelaysOfToleranceActionsToDo=Opóźnienie tolerancji (w dniach) przed wpisu na temat planowanych działań nie został jeszcze zrealizowany Delays_MAIN_DELAY_ACTIONS_TODO=Opóźnienie tolerancji (w dniach) przed wpisu na temat planowanych działań nie został jeszcze zrealizowany
DelaysOfToleranceOrdersToProcess=Opóźnienie tolerancji (w dniach) przed wpisu dotyczącego zamówień jeszcze nie Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Opóźnienie tolerancji (w dniach) przed wpisu dotyczącego zamówień jeszcze nie
DelaysOfTolerancePropalsToClose=Opóźnienie tolerancji (w dniach) przed wpisu w sprawie propozycji, aby zamknąć Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Opóźnienie tolerancji (w dniach) przed wpisu w sprawie propozycji, aby zamknąć
DelaysOfTolerancePropalsToBill=Opóźnienie tolerancji (w dniach) przed wpisu na temat propozycji nie rozliczone Delays_MAIN_DELAY_PROPALS_TO_BILL=Opóźnienie tolerancji (w dniach) przed wpisu na temat propozycji nie rozliczone
DelaysOfToleranceNotActivatedServices=Tolerancja opóźnienia (liczba dni) przed wpisu na usługi, aby uaktywnić Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerancja opóźnienia (liczba dni) przed wpisu na usługi, aby uaktywnić
DelaysOfToleranceRunningServices=Tolerancja opóźnienie (w dniach) upłynął przed wpisu na usługi Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerancja opóźnienie (w dniach) upłynął przed wpisu na usługi
DelaysOfToleranceSupplierBillsToPay=Tolerancja opóźnienia (liczba dni) przed wpisu na dostawcę niezapłaconych faktur Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerancja opóźnienia (liczba dni) przed wpisu na dostawcę niezapłaconych faktur
DelaysOfToleranceCustomerBillsUnpaid=Tolerancja opóźnienia (liczba dni) przed wpisu na klienta niezapłaconych faktur Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerancja opóźnienia (liczba dni) przed wpisu na klienta niezapłaconych faktur
DelaysOfToleranceTransactionsToConciliate=Tolerancja opóźnienia (liczba dni) przed wpisu w oczekiwaniu banku pojednania Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerancja opóźnienia (liczba dni) przed wpisu w oczekiwaniu banku pojednania
DelaysOfToleranceChequesToDeposit=Tolerancja opóźnienia (liczba dni) przed wpisu do deponowania czeków do Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancja opóźnienia (liczba dni) przed wpisu do deponowania czeków do
SetupDescription1=Wszystkie parametry dostępne w konfiguracji obszaru pozwalają na konfigurację Dolibarr przed rozpoczęciem jej używania. SetupDescription1=Wszystkie parametry dostępne w konfiguracji obszaru pozwalają na konfigurację Dolibarr przed rozpoczęciem jej używania.
SetupDescription2=2 Najważniejsze kroki konfiguracji są 2 pierwszych w lewym menu, oznacza to, firmy / fundacji stronie konfiguracji i instalacji modułów strony: SetupDescription2=2 Najważniejsze kroki konfiguracji są 2 pierwszych w lewym menu, oznacza to, firmy / fundacji stronie konfiguracji i instalacji modułów strony:
SetupDescription3=<b>Firma / fundacji</b> konfiguracji jest wymagane, ponieważ wkład informacje są wykorzystywane na Dolibarr wyświetla Dolibarr i zmiany zachowań (na przykład na funkcje związane z danym kraju). SetupDescription3=<b>Firma / fundacji</b> konfiguracji jest wymagane, ponieważ wkład informacje są wykorzystywane na Dolibarr wyświetla Dolibarr i zmiany zachowań (na przykład na funkcje związane z danym kraju).
@ -1143,7 +1143,7 @@ DatabaseServer=Database host
DatabaseUser=Baza danych użytkownika DatabaseUser=Baza danych użytkownika
DatabasePassword=Hasło bazy danych DatabasePassword=Hasło bazy danych
EnableShowLogo=logo Pokaż na menu po lewej stronie EnableShowLogo=logo Pokaż na menu po lewej stronie
DelaysOfToleranceMembers=Tolerancja opóźnienie (w dniach) przed wpisu na opóźnione składki członkowskiej Delays_MAIN_DELAY_MEMBERS=Tolerancja opóźnienie (w dniach) przed wpisu na opóźnione składki członkowskiej
MAIN_ROUNDING_RULE_TOT=Wielkość zaokrąglenia zakres (na nielicznych krajów, gdzie dokonuje się zaokrąglenia na coś innego niż o podstawie 10) MAIN_ROUNDING_RULE_TOT=Wielkość zaokrąglenia zakres (na nielicznych krajów, gdzie dokonuje się zaokrąglenia na coś innego niż o podstawie 10)
UnitPriceOfProduct=Cena netto jednostki produktu UnitPriceOfProduct=Cena netto jednostki produktu
TotalPriceAfterRounding=Łączna cena (netto / VAT / wraz z podatku) po zaokrągleniu TotalPriceAfterRounding=Łączna cena (netto / VAT / wraz z podatku) po zaokrągleniu
@ -1253,7 +1253,7 @@ DictionnarySource=Pochodzenie wniosków / zleceń
MenuSmartphoneManager=Smartphone menedżer menu MenuSmartphoneManager=Smartphone menedżer menu
DefaultMenuManager=Standardowy menedżer menu DefaultMenuManager=Standardowy menedżer menu
DefaultMenuSmartphoneManager=Smartphone menedżer menu DefaultMenuSmartphoneManager=Smartphone menedżer menu
DelaysOfToleranceSuppliersOrdersToProcess=Tolerancja opóźnienie (w dniach) przed wpisem na dostawców zamówień jeszcze nie przetworzonych Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerancja opóźnienie (w dniach) przed wpisem na dostawców zamówień jeszcze nie przetworzonych
SecurityEventsPurged=Zdarzenia zabezpieczeń oczyszczone SecurityEventsPurged=Zdarzenia zabezpieczeń oczyszczone
ShowProfIdInAddress=Pokaż zawodami identyfikator z adresów na dokumentach ShowProfIdInAddress=Pokaż zawodami identyfikator z adresów na dokumentach
TranslationUncomplete=Częściowe tłumaczenie TranslationUncomplete=Częściowe tłumaczenie

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

@ -628,17 +628,17 @@ DelayBeforeWarning=Prazo antes de alerta
DelaysBeforeWarning=Prazos antes de alerta DelaysBeforeWarning=Prazos antes de alerta
DelaysOfToleranceBeforeWarning=Prazos de tolerância antes de alerta DelaysOfToleranceBeforeWarning=Prazos de tolerância antes de alerta
DelaysOfToleranceDesc=Esta janela permite configurar os prazos de tolerância antes de que se alerte com o símbolo %s, sobre cada elemento em atraso. DelaysOfToleranceDesc=Esta janela permite configurar os prazos de tolerância antes de que se alerte com o símbolo %s, sobre cada elemento em atraso.
DelaysOfToleranceActionsToDo=Tolerância de atraso antes da alerta (em dias) sobre ações planificadas não realizadas Delays_MAIN_DELAY_ACTIONS_TODO=Tolerância de atraso antes da alerta (em dias) sobre ações planificadas não realizadas
DelaysOfToleranceOrdersToProcess=Tolerância de atraso antes da alerta (em dias) sobre pedidos não processados Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolerância de atraso antes da alerta (em dias) sobre pedidos não processados
DelaysOfTolerancePropalsToClose=Tolerância de atraso antes da alerta (em dias) sobre Orçamentos a Fechar Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerância de atraso antes da alerta (em dias) sobre Orçamentos a Fechar
DelaysOfTolerancePropalsToBill=Tolerância de atraso antes da alerta (em dias) sobre Orçamentos não faturados Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerância de atraso antes da alerta (em dias) sobre Orçamentos não faturados
DelaysOfToleranceNotActivatedServices=Tolerância de atraso antes da alerta (em dias) sobre serviços a ativar Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerância de atraso antes da alerta (em dias) sobre serviços a ativar
DelaysOfToleranceRunningServices=Tolerância de atraso antes da alerta (em dias) sobre serviços expirados Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerância de atraso antes da alerta (em dias) sobre serviços expirados
DelaysOfToleranceSupplierBillsToPay=Tolerância de atraso antes da alerta (em dias) sobre faturas de provedor impagadas Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerância de atraso antes da alerta (em dias) sobre faturas de provedor impagadas
DelaysOfToleranceCustomerBillsUnpayed=Tolerância de atraso antes da alerta (em dias) sobre faturas a cliente impagadas DelaysOfToleranceCustomerBillsUnpayed=Tolerância de atraso antes da alerta (em dias) sobre faturas a cliente impagadas
DelaysOfToleranceTransactionsToConciliate=Tolerância de atraso antes da alerta (em dias) sobre conciliaciones bancarias pendientes Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerância de atraso antes da alerta (em dias) sobre conciliaciones bancarias pendientes
DelaysOfToleranceMembers=Tolerância de atraso entes da alerta (em dias) sobre honorários adherentes em atraso Delays_MAIN_DELAY_MEMBERS=Tolerância de atraso entes da alerta (em dias) sobre honorários adherentes em atraso
DelaysOfToleranceChequesToDeposit=Tolerância de atraso entes da alerta (em dias) sobre cheques a ingresar Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerância de atraso entes da alerta (em dias) sobre cheques a ingresar
SetupDescription1=Todas as opções do área de configuração são opções que permitem configurar a Dolibarr antes de começar a sua utilização. SetupDescription1=Todas as opções do área de configuração são opções que permitem configurar a Dolibarr antes de começar a sua utilização.
SetupDescription2=Os 2 Passos indispensables da configuração são as 2 primeiroas ao menu esquerdo: a configuração da empresa/Instituição e a configuração dos módulos: SetupDescription2=Os 2 Passos indispensables da configuração são as 2 primeiroas ao menu esquerdo: a configuração da empresa/Instituição e a configuração dos módulos:
SetupDescription3=A configuração <b>Empresa/Instituição</b> a administrar é requerida já que se utiliza a informação para a introdução de dados na maioria das janelas, em inserciones, ou para modificar o comportamento de Dolibarr (como, por Exemplo, das funções que dependem do seu país). SetupDescription3=A configuração <b>Empresa/Instituição</b> a administrar é requerida já que se utiliza a informação para a introdução de dados na maioria das janelas, em inserciones, ou para modificar o comportamento de Dolibarr (como, por Exemplo, das funções que dependem do seu país).

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

@ -607,17 +607,17 @@ DelayBeforeWarning=Prazo antes de alerta
DelaysBeforeWarning=Prazos antes de alerta DelaysBeforeWarning=Prazos antes de alerta
DelaysOfToleranceBeforeWarning=Prazos de tolerancia antes de alerta DelaysOfToleranceBeforeWarning=Prazos de tolerancia antes de alerta
DelaysOfToleranceDesc=Esta janela permite configurar os prazos de tolerancia antes de que se alerte com o símbolo %s, sobre cada elemento em atraso. DelaysOfToleranceDesc=Esta janela permite configurar os prazos de tolerancia antes de que se alerte com o símbolo %s, sobre cada elemento em atraso.
DelaysOfToleranceActionsToDo=Tolerancia de atraso antes da alerta (em días) sobre acções planificadas não realizadas Delays_MAIN_DELAY_ACTIONS_TODO=Tolerancia de atraso antes da alerta (em días) sobre acções planificadas não realizadas
DelaysOfToleranceOrdersToProcess=Tolerancia de atraso antes da alerta (em días) sobre pedidos não procesados Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolerancia de atraso antes da alerta (em días) sobre pedidos não procesados
DelaysOfTolerancePropalsToClose=Tolerancia de atraso antes da alerta (em días) sobre Orçamentos a Fechar Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerancia de atraso antes da alerta (em días) sobre Orçamentos a Fechar
DelaysOfTolerancePropalsToBill=Tolerancia de atraso antes da alerta (em días) sobre Orçamentos não facturados Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerancia de atraso antes da alerta (em días) sobre Orçamentos não facturados
DelaysOfToleranceNotActivatedServices=Tolerancia de atraso antes da alerta (em días) sobre serviços a activar Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerancia de atraso antes da alerta (em días) sobre serviços a activar
DelaysOfToleranceRunningServices=Tolerancia de atraso antes da alerta (em días) sobre serviços expirados Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerancia de atraso antes da alerta (em días) sobre serviços expirados
DelaysOfToleranceSupplierBillsToPay=Tolerancia de atraso antes da alerta (em días) sobre facturas de proveedor impagadas Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerancia de atraso antes da alerta (em días) sobre facturas de proveedor impagadas
DelaysOfToleranceCustomerBillsUnpaid=Tolerancia de atraso antes da alerta (em días) sobre facturas a cliente impagadas Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerancia de atraso antes da alerta (em días) sobre facturas a cliente impagadas
DelaysOfToleranceTransactionsToConciliate=Tolerancia de atraso antes da alerta (em días) sobre conciliaciones bancarias pendientes Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerancia de atraso antes da alerta (em días) sobre conciliaciones bancarias pendientes
DelaysOfToleranceMembers=Tolerancia de atraso entes da alerta (em días) sobre honorários adherentes em atraso Delays_MAIN_DELAY_MEMBERS=Tolerancia de atraso entes da alerta (em días) sobre honorários adherentes em atraso
DelaysOfToleranceChequesToDeposit=Tolerancia de atraso entes da alerta (em días) sobre cheques a ingresar Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancia de atraso entes da alerta (em días) sobre cheques a ingresar
SetupDescription1=Todas as opções do área de configuração são opções que permitem configurar a Dolibarr antes de começar a sua utilização. SetupDescription1=Todas as opções do área de configuração são opções que permitem configurar a Dolibarr antes de começar a sua utilização.
SetupDescription2=Os 2 Passos indispensables da configuração são as 2 primeiroas ao menu esquerdo: a configuração da empresa/Instituição e a configuração dos módulos: SetupDescription2=Os 2 Passos indispensables da configuração são as 2 primeiroas ao menu esquerdo: a configuração da empresa/Instituição e a configuração dos módulos:
SetupDescription3=A configuração <b>Empresa/Instituição</b> a administrar é requerida já que se utiliza a informação para a introdução de dados na maioria das janelas, em inserciones, ou para modificar o comportamento de Dolibarr (como, por Exemplo, das funções que dependem do seu país). SetupDescription3=A configuração <b>Empresa/Instituição</b> a administrar é requerida já que se utiliza a informação para a introdução de dados na maioria das janelas, em inserciones, ou para modificar o comportamento de Dolibarr (como, por Exemplo, das funções que dependem do seu país).
@ -1272,7 +1272,7 @@ DictionnarySource=Origem das propostas / ordens
MenuSmartphoneManager=Gestor de menu Smartphone MenuSmartphoneManager=Gestor de menu Smartphone
DefaultMenuManager=Gestor de menu padrão DefaultMenuManager=Gestor de menu padrão
DefaultMenuSmartphoneManager=Gestor de menu Smartphone DefaultMenuSmartphoneManager=Gestor de menu Smartphone
DelaysOfToleranceSuppliersOrdersToProcess=Tolerância de atraso (em dias) antes de alerta sobre fornecedores ordens ainda não processados Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerância de atraso (em dias) antes de alerta sobre fornecedores ordens ainda não processados
SecurityEventsPurged=Os eventos de segurança purgado SecurityEventsPurged=Os eventos de segurança purgado
ShowProfIdInAddress=Mostrar ID professionnal com endereços em documentos ShowProfIdInAddress=Mostrar ID professionnal com endereços em documentos
TranslationUncomplete=Tradução parcial TranslationUncomplete=Tradução parcial

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

@ -566,16 +566,16 @@ DelayBeforeWarning=Întârziere înainte de avertisment
DelaysBeforeWarning=Întârzieri înainte de avertisment DelaysBeforeWarning=Întârzieri înainte de avertisment
DelaysOfToleranceBeforeWarning=Toleranta întârzieri înainte de avertisment DelaysOfToleranceBeforeWarning=Toleranta întârzieri înainte de avertisment
DelaysOfToleranceDesc=Acest ecran vă permite să definiţi de tolerat întârzieri înainte de o alertă este raportat de pe ecran cu picto %s târziu, pentru fiecare element. DelaysOfToleranceDesc=Acest ecran vă permite să definiţi de tolerat întârzieri înainte de o alertă este raportat de pe ecran cu picto %s târziu, pentru fiecare element.
DelaysOfToleranceActionsToDo=Toleranţă întârziere (în zile) înainte de alertă cu privire la acţiunile planificate care nu au fost încă realizat Delays_MAIN_DELAY_ACTIONS_TODO=Toleranţă întârziere (în zile) înainte de alertă cu privire la acţiunile planificate care nu au fost încă realizat
DelaysOfToleranceOrdersToProcess=Toleranţă întârziere (în zile) înainte de alertă cu privire la ordinele nu a fost încă realizat Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Toleranţă întârziere (în zile) înainte de alertă cu privire la ordinele nu a fost încă realizat
DelaysOfTolerancePropalsToClose=Toleranţă întârziere (în zile) înainte de alertă cu privire la propuneri pentru a închide Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Toleranţă întârziere (în zile) înainte de alertă cu privire la propuneri pentru a închide
DelaysOfTolerancePropalsToBill=Toleranţă întârziere (în zile) înainte de alertă cu privire la propuneri nu facturat Delays_MAIN_DELAY_PROPALS_TO_BILL=Toleranţă întârziere (în zile) înainte de alertă cu privire la propuneri nu facturat
DelaysOfToleranceNotActivatedServices=Toleranta întârziere (în zile) înainte de alertă cu privire la servicii, pentru a activa Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Toleranta întârziere (în zile) înainte de alertă cu privire la servicii, pentru a activa
DelaysOfToleranceRunningServices=Toleranta întârziere (în zile) înainte de alertă cu privire la serviciile expirat Delays_MAIN_DELAY_RUNNING_SERVICES=Toleranta întârziere (în zile) înainte de alertă cu privire la serviciile expirat
DelaysOfToleranceSupplierBillsToPay=Toleranta întârziere (în zile) înainte de alertă cu privire la facturile neachitate furnizorului Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Toleranta întârziere (în zile) înainte de alertă cu privire la facturile neachitate furnizorului
DelaysOfToleranceCustomerBillsUnpaid=Toleranta întârziere (în zile) înainte de alertă cu privire la facturile neachitate de client Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Toleranta întârziere (în zile) înainte de alertă cu privire la facturile neachitate de client
DelaysOfToleranceTransactionsToConciliate=Toleranta întârziere (în zile) înainte de alertă în aşteptarea de pe banca de reconciliere Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Toleranta întârziere (în zile) înainte de alertă în aşteptarea de pe banca de reconciliere
DelaysOfToleranceChequesToDeposit=Toleranta întârziere (în zile) înainte de alertă pentru cecuri de depozit pentru a face Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Toleranta întârziere (în zile) înainte de alertă pentru cecuri de depozit pentru a face
SetupDescription1=Toţi parametrii disponibile în zona de instalare vă permit să setaţi Dolibarr, înainte de a începe utilizarea acestuia. SetupDescription1=Toţi parametrii disponibile în zona de instalare vă permit să setaţi Dolibarr, înainte de a începe utilizarea acestuia.
SetupDescription2=La 2 mai importante sunt paşii de instalare de 2 primul cele din stânga setup meniu, aceasta înseamnă Companie / Fundaţia pagina de configurare pagina de configurare şi module: SetupDescription2=La 2 mai importante sunt paşii de instalare de 2 primul cele din stânga setup meniu, aceasta înseamnă Companie / Fundaţia pagina de configurare pagina de configurare şi module:
SetupDescription3=<b>Companie / Fundaţia</b> setup este necesar, pentru că informaţia este folosită de intrare pe Dolibarr afişează şi de a modifica Dolibarr comportament (de exemplu, de caracteristicile legate de ţara dumneavoastră). SetupDescription3=<b>Companie / Fundaţia</b> setup este necesar, pentru că informaţia este folosită de intrare pe Dolibarr afişează şi de a modifica Dolibarr comportament (de exemplu, de caracteristicile legate de ţara dumneavoastră).
@ -1133,7 +1133,7 @@ DatabaseServer=Baza de date gazdă
DatabaseUser=Baza de date de utilizator DatabaseUser=Baza de date de utilizator
DatabasePassword=Baza de date parola DatabasePassword=Baza de date parola
EnableShowLogo=logo-ul Afişare meniu în stânga EnableShowLogo=logo-ul Afişare meniu în stânga
DelaysOfToleranceMembers=Toleranta întârziere (în zile) înainte de alertă privind taxa de membru întârziat Delays_MAIN_DELAY_MEMBERS=Toleranta întârziere (în zile) înainte de alertă privind taxa de membru întârziat
MAIN_ROUNDING_RULE_TOT=Dimensiune de rotunjire gama (pentru ţările rare în care rotunjirea se face pe altceva decât baza 10) MAIN_ROUNDING_RULE_TOT=Dimensiune de rotunjire gama (pentru ţările rare în care rotunjirea se face pe altceva decât baza 10)
UnitPriceOfProduct=preţul unitar net al unui produs UnitPriceOfProduct=preţul unitar net al unui produs
TotalPriceAfterRounding=Pret total (net / TVA / inclusiv fiscale) după rotunjirea TotalPriceAfterRounding=Pret total (net / TVA / inclusiv fiscale) după rotunjirea
@ -1255,7 +1255,7 @@ DictionnarySource=Originea de propuneri / comenzi
MenuSmartphoneManager=Smartphone meniul Manager MenuSmartphoneManager=Smartphone meniul Manager
DefaultMenuManager=Standard meniul Manager DefaultMenuManager=Standard meniul Manager
DefaultMenuSmartphoneManager=Smartphone meniul Manager DefaultMenuSmartphoneManager=Smartphone meniul Manager
DelaysOfToleranceSuppliersOrdersToProcess=Toleranţă întârziere (în zile) înainte de alertă privind ordinele de furnizori nu au fost încă prelucrate Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Toleranţă întârziere (în zile) înainte de alertă privind ordinele de furnizori nu au fost încă prelucrate
SecurityEventsPurged=Evenimentelor de securitate epurate SecurityEventsPurged=Evenimentelor de securitate epurate
ShowProfIdInAddress=Arată id professionnal cu adrese pe documente ShowProfIdInAddress=Arată id professionnal cu adrese pe documente
TranslationUncomplete=Parţială traducere TranslationUncomplete=Parţială traducere

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

@ -718,16 +718,16 @@ DelayBeforeWarning=Opóźnienie ostrzeżenie przed
DelaysBeforeWarning=Opóźnienia ostrzeżenie przed DelaysBeforeWarning=Opóźnienia ostrzeżenie przed
DelaysOfToleranceBeforeWarning=Tolerancja opóźnień ostrzeżenie przed DelaysOfToleranceBeforeWarning=Tolerancja opóźnień ostrzeżenie przed
DelaysOfToleranceDesc=Ten ekran pozwala na określenie dopuszczalnego opóźnienia przed wpisu jest zgłaszane na ekranie z picto %s dla każdego elementu późno. DelaysOfToleranceDesc=Ten ekran pozwala na określenie dopuszczalnego opóźnienia przed wpisu jest zgłaszane na ekranie z picto %s dla każdego elementu późno.
DelaysOfToleranceActionsToDo=Opóźnienie tolerancji (w dniach) przed wpisu na temat planowanych działań nie został jeszcze zrealizowany Delays_MAIN_DELAY_ACTIONS_TODO=Opóźnienie tolerancji (w dniach) przed wpisu na temat planowanych działań nie został jeszcze zrealizowany
DelaysOfToleranceOrdersToProcess=Opóźnienie tolerancji (w dniach) przed wpisu dotyczącego zamówień jeszcze nie Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Opóźnienie tolerancji (w dniach) przed wpisu dotyczącego zamówień jeszcze nie
DelaysOfTolerancePropalsToClose=Opóźnienie tolerancji (w dniach) przed wpisu w sprawie propozycji, aby zamknąć Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Opóźnienie tolerancji (w dniach) przed wpisu w sprawie propozycji, aby zamknąć
DelaysOfTolerancePropalsToBill=Opóźnienie tolerancji (w dniach) przed wpisu na temat propozycji nie rozliczone Delays_MAIN_DELAY_PROPALS_TO_BILL=Opóźnienie tolerancji (w dniach) przed wpisu na temat propozycji nie rozliczone
DelaysOfToleranceNotActivatedServices=Tolerancja opóźnienia (liczba dni) przed wpisu na usługi, aby uaktywnić Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerancja opóźnienia (liczba dni) przed wpisu na usługi, aby uaktywnić
DelaysOfToleranceRunningServices=Tolerancja opóźnienie (w dniach) upłynął przed wpisu na usługi Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerancja opóźnienie (w dniach) upłynął przed wpisu na usługi
DelaysOfToleranceSupplierBillsToPay=Tolerancja opóźnienia (liczba dni) przed wpisu na dostawcę niezapłaconych faktur Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerancja opóźnienia (liczba dni) przed wpisu na dostawcę niezapłaconych faktur
DelaysOfToleranceCustomerBillsUnpaid=Tolerancja opóźnienia (liczba dni) przed wpisu na klienta niezapłaconych faktur Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerancja opóźnienia (liczba dni) przed wpisu na klienta niezapłaconych faktur
DelaysOfToleranceTransactionsToConciliate=Tolerancja opóźnienia (liczba dni) przed wpisu w oczekiwaniu banku pojednania Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerancja opóźnienia (liczba dni) przed wpisu w oczekiwaniu banku pojednania
DelaysOfToleranceChequesToDeposit=Tolerancja opóźnienia (liczba dni) przed wpisu do deponowania czeków do Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancja opóźnienia (liczba dni) przed wpisu do deponowania czeków do
SetupDescription1=Wszystkie parametry dostępne w konfiguracji obszaru pozwalają na konfigurację Dolibarr przed rozpoczęciem jej używania. SetupDescription1=Wszystkie parametry dostępne w konfiguracji obszaru pozwalają na konfigurację Dolibarr przed rozpoczęciem jej używania.
SetupDescription2=2 Najważniejsze kroki konfiguracji są 2 pierwszych w lewym menu, oznacza to, firmy / fundacji stronie konfiguracji i instalacji modułów strony: SetupDescription2=2 Najważniejsze kroki konfiguracji są 2 pierwszych w lewym menu, oznacza to, firmy / fundacji stronie konfiguracji i instalacji modułów strony:
SetupDescription3=<b>Firma / fundacji</b> konfiguracji jest wymagane, ponieważ wkład informacje są wykorzystywane na Dolibarr wyświetla Dolibarr i zmiany zachowań (na przykład na funkcje związane z danym kraju). SetupDescription3=<b>Firma / fundacji</b> konfiguracji jest wymagane, ponieważ wkład informacje są wykorzystywane na Dolibarr wyświetla Dolibarr i zmiany zachowań (na przykład na funkcje związane z danym kraju).

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

@ -565,16 +565,16 @@ DelayBeforeWarning=Задержка перед предупреждение
DelaysBeforeWarning=Задержки перед предупреждение DelaysBeforeWarning=Задержки перед предупреждение
DelaysOfToleranceBeforeWarning=Терпимость задержки перед предупреждение DelaysOfToleranceBeforeWarning=Терпимость задержки перед предупреждение
DelaysOfToleranceDesc=Этот экран позволяет вам определить мириться с задержками до готовности сообщения на экране при picto %s в конце каждого элемента. DelaysOfToleranceDesc=Этот экран позволяет вам определить мириться с задержками до готовности сообщения на экране при picto %s в конце каждого элемента.
DelaysOfToleranceActionsToDo=Задержка толерантности (в днях) до предупреждений о планируемых действиях и не понял Delays_MAIN_DELAY_ACTIONS_TODO=Задержка толерантности (в днях) до предупреждений о планируемых действиях и не понял
DelaysOfToleranceOrdersToProcess=Задержка толерантности (в днях) до готовности при заказах, еще не сделали Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Задержка толерантности (в днях) до готовности при заказах, еще не сделали
DelaysOfTolerancePropalsToClose=Задержка толерантности (в днях) до оповещения о предложениях, чтобы закрыть Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Задержка толерантности (в днях) до оповещения о предложениях, чтобы закрыть
DelaysOfTolerancePropalsToBill=Задержка толерантности (в днях) до оповещения о предложениях не будет взиматься Delays_MAIN_DELAY_PROPALS_TO_BILL=Задержка толерантности (в днях) до оповещения о предложениях не будет взиматься
DelaysOfToleranceNotActivatedServices=Терпимость задержки (в днях) до готовности на услуги для активации Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Терпимость задержки (в днях) до готовности на услуги для активации
DelaysOfToleranceRunningServices=Терпимость задержки (в днях) до оповещения о истек услуги Delays_MAIN_DELAY_RUNNING_SERVICES=Терпимость задержки (в днях) до оповещения о истек услуги
DelaysOfToleranceSupplierBillsToPay=Терпимость задержки (в днях) до готовности на неоплачиваемую поставщиком счета-фактуры Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Терпимость задержки (в днях) до готовности на неоплачиваемую поставщиком счета-фактуры
DelaysOfToleranceCustomerBillsUnpaid=Терпимость задержки (в днях) до готовности на неоплачиваемую клиентом счета-фактуры Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Терпимость задержки (в днях) до готовности на неоплачиваемую клиентом счета-фактуры
DelaysOfToleranceTransactionsToConciliate=Терпимость задержки (в днях) до оповещения о текущих банковских счетов Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Терпимость задержки (в днях) до оповещения о текущих банковских счетов
DelaysOfToleranceChequesToDeposit=Терпимость задержки (в днях) до полной готовности к чеки сделать депозит Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Терпимость задержки (в днях) до полной готовности к чеки сделать депозит
SetupDescription1=Все параметры, доступные в области настройки позволяют настроить Dolibarr до начала его использования. SetupDescription1=Все параметры, доступные в области настройки позволяют настроить Dolibarr до начала его использования.
SetupDescription2=2 наиболее важных шагов установки 2 первых в левом меню, это означает, Компания / Фонд настроить страницу и страницу настройки модулей: SetupDescription2=2 наиболее важных шагов установки 2 первых в левом меню, это означает, Компания / Фонд настроить страницу и страницу настройки модулей:
SetupDescription3=<b>Компании / Фонд</b> установки требуется ввод информации, так как используется на Dolibarr и отображает изменения Dolibarr поведения (например, функции, относящиеся к вашей стране). SetupDescription3=<b>Компании / Фонд</b> установки требуется ввод информации, так как используется на Dolibarr и отображает изменения Dolibarr поведения (например, функции, относящиеся к вашей стране).
@ -1141,7 +1141,7 @@ DatabaseServer=База данных принимающей
DatabaseUser=База данных пользователей DatabaseUser=База данных пользователей
DatabasePassword=Пароль базы данных DatabasePassword=Пароль базы данных
EnableShowLogo=Показать логотип на левом меню EnableShowLogo=Показать логотип на левом меню
DelaysOfToleranceMembers=Толерантность задержки (в днях) до оповещения по отсроченным членский взнос Delays_MAIN_DELAY_MEMBERS=Толерантность задержки (в днях) до оповещения по отсроченным членский взнос
MAIN_ROUNDING_RULE_TOT=Размер округления диапазона (для тех стран, где округление происходит что-то другое, чем по основанию 10) MAIN_ROUNDING_RULE_TOT=Размер округления диапазона (для тех стран, где округление происходит что-то другое, чем по основанию 10)
UnitPriceOfProduct=Чистая цена единицы продукта UnitPriceOfProduct=Чистая цена единицы продукта
TotalPriceAfterRounding=Общая стоимость (нетто / НДС / включая налоги) после округления TotalPriceAfterRounding=Общая стоимость (нетто / НДС / включая налоги) после округления
@ -1240,7 +1240,7 @@ DictionnarySource=Происхождение предложений / заказ
MenuSmartphoneManager=Смартфон менеджер меню MenuSmartphoneManager=Смартфон менеджер меню
DefaultMenuManager=Стандартное меню менеджера DefaultMenuManager=Стандартное меню менеджера
DefaultMenuSmartphoneManager=Смартфон менеджер меню DefaultMenuSmartphoneManager=Смартфон менеджер меню
DelaysOfToleranceSuppliersOrdersToProcess=Задержка толерантности (в днях) до предупреждения о поставщиках заказов еще не обработанных Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Задержка толерантности (в днях) до предупреждения о поставщиках заказов еще не обработанных
ShowProfIdInAddress=Показать профессионала идентификатор с адресами на документах ShowProfIdInAddress=Показать профессионала идентификатор с адресами на документах
TranslationUncomplete=Частичный перевод TranslationUncomplete=Частичный перевод
SomeTranslationAreUncomplete=Некоторые языки могут быть частично переведены или могут содержит ошибки. Если вы обнаружили некоторые, вы можете <b>исправить. Lang</b> текстовые файлы в каталоге <b>htdocs/langs</b> и представить их на форуме в <a href="http://www.dolibarr.org/forum" target="_blank">http://www.dolibarr.org</a> . SomeTranslationAreUncomplete=Некоторые языки могут быть частично переведены или могут содержит ошибки. Если вы обнаружили некоторые, вы можете <b>исправить. Lang</b> текстовые файлы в каталоге <b>htdocs/langs</b> и представить их на форуме в <a href="http://www.dolibarr.org/forum" target="_blank">http://www.dolibarr.org</a> .

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

@ -757,18 +757,18 @@ DelayBeforeWarning = Zakasnitev pred opozorilom
DelaysBeforeWarning = Zakasnitve pred opozorilom DelaysBeforeWarning = Zakasnitve pred opozorilom
DelaysOfToleranceBeforeWarning = Toleranca zakasnitve pred opozorilom DelaysOfToleranceBeforeWarning = Toleranca zakasnitve pred opozorilom
DelaysOfToleranceDesc = Ta zaslon omogoča definicijo tolerance zakasnitve preden se opozorilo prikaže na zaslonu v obliki piktograma %s za vsak zakasnjen element. DelaysOfToleranceDesc = Ta zaslon omogoča definicijo tolerance zakasnitve preden se opozorilo prikaže na zaslonu v obliki piktograma %s za vsak zakasnjen element.
DelaysOfToleranceActionsToDo = Toleranca zakasnitve (v dnevih) pred opozorilom na še nerealizirano planirano aktivnost Delays_MAIN_DELAY_ACTIONS_TODO = Toleranca zakasnitve (v dnevih) pred opozorilom na še nerealizirano planirano aktivnost
DelaysOfToleranceOrdersToProcess = Toleranca zakasnitve (v dnevih) pred opozorilom na še nedokončana naročila Delays_MAIN_DELAY_ORDERS_TO_PROCESS = Toleranca zakasnitve (v dnevih) pred opozorilom na še nedokončana naročila
DelaysOfToleranceSuppliersOrdersToProcess = Toleranca zakasnitve (v dnevih) pred opozorilom na še nedokončana naročila pri dobaviteljih Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS = Toleranca zakasnitve (v dnevih) pred opozorilom na še nedokončana naročila pri dobaviteljih
DelaysOfTolerancePropalsToClose = Toleranca zakasnitve (v dnevih) pred opozorilom na ponudbe, ki jih je treba zaključiti Delays_MAIN_DELAY_PROPALS_TO_CLOSE = Toleranca zakasnitve (v dnevih) pred opozorilom na ponudbe, ki jih je treba zaključiti
DelaysOfTolerancePropalsToBill = Toleranca zakasnitve (v dnevih) pred opozorilom na nefakturirane ponudbe Delays_MAIN_DELAY_PROPALS_TO_BILL = Toleranca zakasnitve (v dnevih) pred opozorilom na nefakturirane ponudbe
DelaysOfToleranceNotActivatedServices = Toleranca zakasnitve (v dnevih) pred opozorilom na storitve, ki jih je potrebno aktivirati Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES = Toleranca zakasnitve (v dnevih) pred opozorilom na storitve, ki jih je potrebno aktivirati
DelaysOfToleranceRunningServices = Toleranca zakasnitve (v dnevih) pred opozorilom na potečeno storitev Delays_MAIN_DELAY_RUNNING_SERVICES = Toleranca zakasnitve (v dnevih) pred opozorilom na potečeno storitev
DelaysOfToleranceSupplierBillsToPay = Toleranca zakasnitve (v dnevih) pred opozorilom na neplačane račune dobavitelju Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY = Toleranca zakasnitve (v dnevih) pred opozorilom na neplačane račune dobavitelju
DelaysOfToleranceCustomerBillsUnpaid = Toleranca zakasnitve (v dnevih) pred opozorilom na neplačane račune kupcev Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED = Toleranca zakasnitve (v dnevih) pred opozorilom na neplačane račune kupcev
DelaysOfToleranceTransactionsToConciliate = Toleranca zakasnitve (v dnevih) pred opozorilom na čakajočo uskladitev z banko Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE = Toleranca zakasnitve (v dnevih) pred opozorilom na čakajočo uskladitev z banko
DelaysOfToleranceMembers = Toleranca zakasnitve (v dnevih) pred opozorilom na zakasnitev plačila članarine Delays_MAIN_DELAY_MEMBERS = Toleranca zakasnitve (v dnevih) pred opozorilom na zakasnitev plačila članarine
DelaysOfToleranceChequesToDeposit = Toleranca zakasnitve (v dnevih) pred opozorilom na potrebo po deponiranju čeka Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT = Toleranca zakasnitve (v dnevih) pred opozorilom na potrebo po deponiranju čeka
SetupDescription1 = Vsi parametri, ki so na voljo v področju nastavitev, vam omogočajo nastavitev aplikacije Dolibarr pred začetkom uporabe. SetupDescription1 = Vsi parametri, ki so na voljo v področju nastavitev, vam omogočajo nastavitev aplikacije Dolibarr pred začetkom uporabe.
SetupDescription2 = Dva najpomembnejša koraka nastavitev sta prva dva na levem meniju, kar pomeni stran za nastavitve podjetja/ustanove in stran za nastanitve modulov: SetupDescription2 = Dva najpomembnejša koraka nastavitev sta prva dva na levem meniju, kar pomeni stran za nastavitve podjetja/ustanove in stran za nastanitve modulov:
SetupDescription3 = Parametri na meniju <b>Nastavitve -> Podjetje/ustanova</b> so zahtevani, ker se vnesene informacije uporabljajo na posameznih zaslonih v aplikaciji Dolibarr in za določitev načina delovanja Dolibarr aplikacije (na primer za funkcije, ki se nanašajo na vašo državo). SetupDescription3 = Parametri na meniju <b>Nastavitve -> Podjetje/ustanova</b> so zahtevani, ker se vnesene informacije uporabljajo na posameznih zaslonih v aplikaciji Dolibarr in za določitev načina delovanja Dolibarr aplikacije (na primer za funkcije, ki se nanašajo na vašo državo).

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

@ -706,17 +706,17 @@ DelayBeforeWarning=Fördröjning före varning
DelaysBeforeWarning=Förseningar innan varning DelaysBeforeWarning=Förseningar innan varning
DelaysOfToleranceBeforeWarning=Tolerans förseningar innan varning DelaysOfToleranceBeforeWarning=Tolerans förseningar innan varning
DelaysOfToleranceDesc=Den här skärmen kan du definiera den tillåtna dröjsmål innan en registrering rapporteras på skärmen med Picto %s för varje försenad element. DelaysOfToleranceDesc=Den här skärmen kan du definiera den tillåtna dröjsmål innan en registrering rapporteras på skärmen med Picto %s för varje försenad element.
DelaysOfToleranceActionsToDo=Fördröjning tolerans (i dagar) före registrering om planerade åtgärder som ännu inte realiserats Delays_MAIN_DELAY_ACTIONS_TODO=Fördröjning tolerans (i dagar) före registrering om planerade åtgärder som ännu inte realiserats
DelaysOfToleranceOrdersToProcess=Fördröjning tolerans (i dagar) före registrering om order som ännu inte gjort Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Fördröjning tolerans (i dagar) före registrering om order som ännu inte gjort
DelaysOfTolerancePropalsToClose=Fördröjning tolerans (i dagar) före registrering om förslag att stänga Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Fördröjning tolerans (i dagar) före registrering om förslag att stänga
DelaysOfTolerancePropalsToBill=Fördröjning tolerans (i dagar) före registrering om förslag faktureras inte Delays_MAIN_DELAY_PROPALS_TO_BILL=Fördröjning tolerans (i dagar) före registrering om förslag faktureras inte
DelaysOfToleranceNotActivatedServices=Tolerans fördröjning (i dagar) före registrering om tjänster för att aktivera Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerans fördröjning (i dagar) före registrering om tjänster för att aktivera
DelaysOfToleranceRunningServices=Tolerans fördröjning (i dagar) före registrering om passerat tjänster Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerans fördröjning (i dagar) före registrering om passerat tjänster
DelaysOfToleranceSupplierBillsToPay=Tolerans fördröjning (i dagar) före registrering om obetalda leverantörsfakturor Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerans fördröjning (i dagar) före registrering om obetalda leverantörsfakturor
DelaysOfToleranceCustomerBillsUnpaid=Tolerans fördröjning (i dagar) före registrering om obetalda klient fakturor Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerans fördröjning (i dagar) före registrering om obetalda klient fakturor
DelaysOfToleranceTransactionsToConciliate=Tolerans fördröjning (i dagar) före registrering om väntan bankavstämning Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerans fördröjning (i dagar) före registrering om väntan bankavstämning
DelaysOfToleranceMembers=Tolerans fördröjning (i dagar) före registrering om försenad medlemsavgift Delays_MAIN_DELAY_MEMBERS=Tolerans fördröjning (i dagar) före registrering om försenad medlemsavgift
DelaysOfToleranceChequesToDeposit=Tolerans fördröjning (i dagar) före registrering om kontroller insättning för att göra Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerans fördröjning (i dagar) före registrering om kontroller insättning för att göra
SetupDescription1=Alla parametrar är tillgängliga i installationsprogrammet området kan du setup Dolibarr innan du använder det. SetupDescription1=Alla parametrar är tillgängliga i installationsprogrammet området kan du setup Dolibarr innan du använder det.
SetupDescription2=De två viktigaste installationsprocessen är de två första som i den vänstra inställningsmenyn, innebär detta bolag / stiftelse installationssidan och moduler setup sida: SetupDescription2=De två viktigaste installationsprocessen är de två första som i den vänstra inställningsmenyn, innebär detta bolag / stiftelse installationssidan och moduler setup sida:
SetupDescription3=Parametrar i menyn <b>Setup -&gt; Företag / stiftelse</b> är nödvändiga eftersom in information används på Dolibarr skärmar och att ändra Dolibarr beteende (till exempel för funktioner som rör ditt land). SetupDescription3=Parametrar i menyn <b>Setup -&gt; Företag / stiftelse</b> är nödvändiga eftersom in information används på Dolibarr skärmar och att ändra Dolibarr beteende (till exempel för funktioner som rör ditt land).
@ -1238,7 +1238,7 @@ DictionnarySource=Ursprung förslag / order
MenuSmartphoneManager=Smartphone menyhanteraren MenuSmartphoneManager=Smartphone menyhanteraren
DefaultMenuManager=Standard Menu Manager DefaultMenuManager=Standard Menu Manager
DefaultMenuSmartphoneManager=Smartphone menyhanteraren DefaultMenuSmartphoneManager=Smartphone menyhanteraren
DelaysOfToleranceSuppliersOrdersToProcess=Fördröjning tolerans (i dagar) före registrering om leverantörer order som ännu inte behandlats Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Fördröjning tolerans (i dagar) före registrering om leverantörer order som ännu inte behandlats
SecurityEventsPurged=Säkerhetshändelser renas SecurityEventsPurged=Säkerhetshändelser renas
ShowProfIdInAddress=Visa branschorganisationer id med adresser på dokument ShowProfIdInAddress=Visa branschorganisationer id med adresser på dokument
TranslationUncomplete=Partiell översättning TranslationUncomplete=Partiell översättning

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

@ -690,18 +690,18 @@ DelayBeforeWarning=Uyarıdan önce gecikme
DelaysBeforeWarning=Uyarı öncesi gecikmeler DelaysBeforeWarning=Uyarı öncesi gecikmeler
DelaysOfToleranceBeforeWarning=Uyarı öncesi gecikme toleransları DelaysOfToleranceBeforeWarning=Uyarı öncesi gecikme toleransları
DelaysOfToleranceDesc= Bu ekran, ekranda picto %s ile bir uyarı bildirilmeden önce tolere edilebilecek gecikmeleri tanımlamanızı sağlar. DelaysOfToleranceDesc= Bu ekran, ekranda picto %s ile bir uyarı bildirilmeden önce tolere edilebilecek gecikmeleri tanımlamanızı sağlar.
DelaysOfToleranceActionsToDo=Henüz gerçekleşmemiş planlı eylemler için uyarı yapılmadan önceki gecikme toleransı (gün olarak). Delays_MAIN_DELAY_ACTIONS_TODO=Henüz gerçekleşmemiş planlı eylemler için uyarı yapılmadan önceki gecikme toleransı (gün olarak).
DelaysOfToleranceOrdersToProcess=Henüz işleme konulmamış siparişler öncesi uyarı yapılmadan önceki gecikme toleransı (gün olarak). Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Henüz işleme konulmamış siparişler öncesi uyarı yapılmadan önceki gecikme toleransı (gün olarak).
DelaysOfToleranceSuppliersOrdersToProcess= Henüz işleme konulmamış müşteri siparişleri öncesi uyarı yapılmadan önceki gecikme toleransı (gün olarak). Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS= Henüz işleme konulmamış müşteri siparişleri öncesi uyarı yapılmadan önceki gecikme toleransı (gün olarak).
DelaysOfTolerancePropalsToClose=Henüz kapatılmamış teklifler öncesi uyarı yapılmadan önceki gecikme toleransı (gün olarak). Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Henüz kapatılmamış teklifler öncesi uyarı yapılmadan önceki gecikme toleransı (gün olarak).
DelaysOfTolerancePropalsToBill=Henüz faturalandırılmamış teklifler öncesi uyarı yapılmadan önceki gecikme toleransı (gün olarak). Delays_MAIN_DELAY_PROPALS_TO_BILL=Henüz faturalandırılmamış teklifler öncesi uyarı yapılmadan önceki gecikme toleransı (gün olarak).
DelaysOfToleranceNotActivatedServices=Etkinleştirilecek hizmetler için uyarı öncesi gecikme toleransı (gün olarak). Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Etkinleştirilecek hizmetler için uyarı öncesi gecikme toleransı (gün olarak).
DelaysOfToleranceRunningServices=Süresi dolan hizmetler için uyarı öncesi gecikme toleransı (gün olarak). Delays_MAIN_DELAY_RUNNING_SERVICES=Süresi dolan hizmetler için uyarı öncesi gecikme toleransı (gün olarak).
DelaysOfToleranceSupplierBillsToPay=Ödenmemiş tedarikçi faturaları uyarısı öncesi gecikme toleransı (gün olarak) Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Ödenmemiş tedarikçi faturaları uyarısı öncesi gecikme toleransı (gün olarak)
DelaysOfToleranceCustomerBillsUnpaid=Ödenmemiş müşteri faturaları uyarısı öncesi gecikme toleransı (gün olarak) Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Ödenmemiş müşteri faturaları uyarısı öncesi gecikme toleransı (gün olarak)
DelaysOfToleranceTransactionsToConciliate=Bekleyen banka uzlaşmaları uyarısı öncesi gecikme toleransı (gün olarak) Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Bekleyen banka uzlaşmaları uyarısı öncesi gecikme toleransı (gün olarak)
DelaysOfToleranceMembers=Gecikmiş üyelik ücreti uyarısı öncesi gecikme toleransı (gün olarak) Delays_MAIN_DELAY_MEMBERS=Gecikmiş üyelik ücreti uyarısı öncesi gecikme toleransı (gün olarak)
DelaysOfToleranceChequesToDeposit=Çek ödemesi uyarısı öncesi gecikme tolerans (gün olarak) Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Çek ödemesi uyarısı öncesi gecikme tolerans (gün olarak)
SetupDescription1= Dolibarr’ı kullanmaya başlamadan önce kurulumunun yapılması gereken bütün parametreler kurulum alanındadır. SetupDescription1= Dolibarr’ı kullanmaya başlamadan önce kurulumunun yapılması gereken bütün parametreler kurulum alanındadır.
SetupDescription2=2 en önemli kurulum adımları sol kurulum menüsündeki ilk 2 adımdır, bu demektir ki Firma / kuruluş kurulum sayfası ve Modül kurulum sayfası: SetupDescription2=2 en önemli kurulum adımları sol kurulum menüsündeki ilk 2 adımdır, bu demektir ki Firma / kuruluş kurulum sayfası ve Modül kurulum sayfası:
SetupDescription3=<b>Kurulum->Firma/Kuruluş<b> menüsündeki parametreler gereklidir, çünkü giriş bilgileri Dolibarr ekranlarında ve Dolibarr’ın davranışlarını değiştirmek üzere kullanılır (örneğin ülkenizle ilgili özellikler). SetupDescription3=<b>Kurulum->Firma/Kuruluş<b> menüsündeki parametreler gereklidir, çünkü giriş bilgileri Dolibarr ekranlarında ve Dolibarr’ın davranışlarını değiştirmek üzere kullanılır (örneğin ülkenizle ilgili özellikler).
@ -1180,7 +1180,7 @@ Permission50201=Işlemleri oku
Permission50202=İçeaktarma işlemleri Permission50202=İçeaktarma işlemleri
DictionnaryAvailability=Teslimat gecikmesi DictionnaryAvailability=Teslimat gecikmesi
DictionnaryOrderMethods=Sıralama yöntemleri DictionnaryOrderMethods=Sıralama yöntemleri
DelaysOfToleranceSuppliersOrdersToProcess=İşlem görmemiş tedarikçi siparişleri uyarısından önceki gecikme toleransı (gün) Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=İşlem görmemiş tedarikçi siparişleri uyarısından önceki gecikme toleransı (gün)
MAIN_ROUNDING_RULE_TOT=Yuvarlama aralığı Boyutu (nadir ülkelerde 10 tabanından başka yuvarlama yapılır) MAIN_ROUNDING_RULE_TOT=Yuvarlama aralığı Boyutu (nadir ülkelerde 10 tabanından başka yuvarlama yapılır)
UnitPriceOfProduct=Bir ürünün net birim fiyatı UnitPriceOfProduct=Bir ürünün net birim fiyatı
TotalPriceAfterRounding=Yuvarlama sonrası toplam fiyat (net/KDV/vergi dahil) TotalPriceAfterRounding=Yuvarlama sonrası toplam fiyat (net/KDV/vergi dahil)

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

@ -697,17 +697,17 @@ DelayBeforeWarning=前延迟的警告
DelaysBeforeWarning=时滞前警告 DelaysBeforeWarning=时滞前警告
DelaysOfToleranceBeforeWarning=前警告性延误 DelaysOfToleranceBeforeWarning=前警告性延误
DelaysOfToleranceDesc=这个屏幕允许你定义的警报之前不能容忍拖延是与象形％s的屏幕报晚元素。 DelaysOfToleranceDesc=这个屏幕允许你定义的警报之前不能容忍拖延是与象形％s的屏幕报晚元素。
DelaysOfToleranceActionsToDo=延迟容忍（在天前通知）对尚未实现的行动计划 Delays_MAIN_DELAY_ACTIONS_TODO=延迟容忍（在天前通知）对尚未实现的行动计划
DelaysOfToleranceOrdersToProcess=延迟容忍（在天前通知）对尚未完成的订单 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=延迟容忍（在天前通知）对尚未完成的订单
DelaysOfTolerancePropalsToClose=延迟容忍（在天前通知）关于建议关闭 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=延迟容忍（在天前通知）关于建议关闭
DelaysOfTolerancePropalsToBill=延迟容忍（在天前通知）对提案不计费 Delays_MAIN_DELAY_PROPALS_TO_BILL=延迟容忍（在天前通知）对提案不计费
DelaysOfToleranceNotActivatedServices=容忍延迟（在天前通知）到服务激活 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=容忍延迟（在天前通知）到服务激活
DelaysOfToleranceRunningServices=容忍延迟（在天前通知）对过期服务 Delays_MAIN_DELAY_RUNNING_SERVICES=容忍延迟（在天前通知）对过期服务
DelaysOfToleranceSupplierBillsToPay=容忍延迟（天数）前未付供应商发票警报 Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=容忍延迟（天数）前未付供应商发票警报
DelaysOfToleranceCustomerBillsUnpaid=容忍延迟（天数）客户端之前，未付发票警报 Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=容忍延迟（天数）客户端之前，未付发票警报
DelaysOfToleranceTransactionsToConciliate=容忍延迟（在天前通知）对悬而未决的银行对帐 Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=容忍延迟（在天前通知）对悬而未决的银行对帐
DelaysOfToleranceMembers=容忍延迟（天数）延迟之前会费警报 Delays_MAIN_DELAY_MEMBERS=容忍延迟（天数）延迟之前会费警报
DelaysOfToleranceChequesToDeposit=容忍延迟（在天前通知）支票存款做 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=容忍延迟（在天前通知）支票存款做
SetupDescription1=所有参数可在安装区设置让你开始使用它之前Dolibarr。 SetupDescription1=所有参数可在安装区设置让你开始使用它之前Dolibarr。
SetupDescription2=最重要的2安装步骤2在左侧的设置菜单中的第一，这意味着公司/基础设置页和模块设置页： SetupDescription2=最重要的2安装步骤2在左侧的设置菜单中的第一，这意味着公司/基础设置页和模块设置页：
SetupDescription3=菜单参数<b>安装“ - &gt;公司/基础</b>是必要的，因为输入的信息是用于Dolibarr显示和修改Dolibarr行为的国家（例如您要为特征有关）。 SetupDescription3=菜单参数<b>安装“ - &gt;公司/基础</b>是必要的，因为输入的信息是用于Dolibarr显示和修改Dolibarr行为的国家（例如您要为特征有关）。
@ -1234,7 +1234,7 @@ DictionnarySource=建议/订单的起源
MenuSmartphoneManager=智能手机菜单管理 MenuSmartphoneManager=智能手机菜单管理
DefaultMenuManager=标准菜单管理 DefaultMenuManager=标准菜单管理
DefaultMenuSmartphoneManager=智能手机菜单管理 DefaultMenuSmartphoneManager=智能手机菜单管理
DelaysOfToleranceSuppliersOrdersToProcess=延迟容忍（天）前尚未处理的供应商的订单提醒 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=延迟容忍（天）前尚未处理的供应商的订单提醒
SecurityEventsPurged=安全事件清除 SecurityEventsPurged=安全事件清除
ShowProfIdInAddress=文件上显示professionnal地址ID ShowProfIdInAddress=文件上显示professionnal地址ID
TranslationUncomplete=部分翻译 TranslationUncomplete=部分翻译

4
htdocs/user/class/usergroup.class.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (c) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (c) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (c) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (c) 2005-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>
* *
* 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
@ -437,7 +437,7 @@ class UserGroup extends CommonObject
return; return;
} }
if ($this->all_permissions_are_loaded) if (! empty($this->all_permissions_are_loaded))
{ {
// Si les permissions ont deja ete chargees, on quitte // Si les permissions ont deja ete chargees, on quitte
return; return;

21
htdocs/user/clicktodial.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 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
@ -133,17 +134,17 @@ if ($id)
print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("Login").'</td>'; print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("Login").'</td>';
print '<td class="valeur">'; print '<td class="valeur">';
print '<input name="login" value="'.$fuser->clicktodial_login.'"></td>'; print '<input name="login" value="'.(! empty($fuser->clicktodial_login)?$fuser->clicktodial_login:'').'"></td>';
print '</tr>'; print '</tr>';
print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("Password").'</td>'; print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("Password").'</td>';
print '<td class="valeur">'; print '<td class="valeur">';
print '<input name="password" value="'.$fuser->clicktodial_password.'"></td>'; print '<input name="password" value="'.(! empty($fuser->clicktodial_password)?$fuser->clicktodial_password:'').'"></td>';
print "</tr>\n"; print "</tr>\n";
print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>'; print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
print '<td class="valeur">'; print '<td class="valeur">';
print '<input name="poste" value="'.$fuser->clicktodial_poste.'"></td>'; print '<input name="poste" value="'.(! empty($fuser->clicktodial_poste)?$fuser->clicktodial_poste:'').'"></td>';
print "</tr>\n"; print "</tr>\n";
print '<tr><td colspan="2" align="center"><input class="button" type="submit" value="'.$langs->trans("Save").'">'; print '<tr><td colspan="2" align="center"><input class="button" type="submit" value="'.$langs->trans("Save").'">';
@ -158,7 +159,7 @@ if ($id)
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
if ($user->admin) if (! empty($user->admin))
{ {
print "<tr>".'<td width="25%" valign="top">ClickToDial URL</td>'; print "<tr>".'<td width="25%" valign="top">ClickToDial URL</td>';
print '<td class="valeur">'; print '<td class="valeur">';
@ -172,13 +173,13 @@ if ($id)
print '</tr>'; print '</tr>';
} }
print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("Login").'</td>'; print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("Login").'</td>';
print '<td class="valeur">'.$fuser->clicktodial_login.'</td>'; print '<td class="valeur">'.(! empty($fuser->clicktodial_login)?$fuser->clicktodial_login:'').'</td>';
print '</tr>'; print '</tr>';
print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("Password").'</td>'; print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("Password").'</td>';
print '<td class="valeur">'.preg_replace('/./','*',$fuser->clicktodial_password).'</a></td>'; print '<td class="valeur">'.preg_replace('/./','*',(! empty($fuser->clicktodial_password)?$fuser->clicktodial_password:'')).'</a></td>';
print "</tr>\n"; print "</tr>\n";
print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>'; print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
print '<td class="valeur">'.$fuser->clicktodial_poste.'</td>'; print '<td class="valeur">'.(! empty($fuser->clicktodial_poste)?$fuser->clicktodial_poste:'').'</td>';
print "</tr></table>\n"; print "</tr></table>\n";
} }
@ -189,7 +190,7 @@ if ($id)
*/ */
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($user->admin && $action <> 'edit') if (! empty($user->admin) && $action <> 'edit')
{ {
print '<a class="butAction" href="clicktodial.php?id='.$fuser->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'; print '<a class="butAction" href="clicktodial.php?id='.$fuser->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
} }

219
htdocs/user/fiche.php
View File

@ -32,26 +32,28 @@ require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); if (! empty($conf->ldap->enabled)) require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); if (! empty($conf->adherent->enabled)) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
if (! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php"); if (! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php");
$id = GETPOST('id','int'); $id = GETPOST('id','int');
$action = GETPOST("action"); $action = GETPOST('action','alpha');
$confirm = GETPOST('confirm','alpha');
$subaction = GETPOST('subaction','alpha');
$group = GETPOST("group","int",3); $group = GETPOST("group","int",3);
$confirm = GETPOST("confirm"); $message='';
// Define value to know what current user can do on users // Define value to know what current user can do on users
$canadduser=($user->admin || $user->rights->user->user->creer); $canadduser=(! empty($user->admin) || $user->rights->user->user->creer);
$canreaduser=($user->admin || $user->rights->user->user->lire); $canreaduser=(! empty($user->admin) || $user->rights->user->user->lire);
$canedituser=($user->admin || $user->rights->user->user->creer); $canedituser=(! empty($user->admin) || $user->rights->user->user->creer);
$candisableuser=($user->admin || $user->rights->user->user->supprimer); $candisableuser=(! empty($user->admin) || $user->rights->user->user->supprimer);
$canreadgroup=$canreaduser; $canreadgroup=$canreaduser;
$caneditgroup=$canedituser; $caneditgroup=$canedituser;
if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS)) if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
{ {
$canreadgroup=($user->admin || $user->rights->user->group_advance->read); $canreadgroup=(! empty($user->admin) || $user->rights->user->group_advance->read);
$caneditgroup=($user->admin || $user->rights->user->group_advance->write); $caneditgroup=(! empty($user->admin) || $user->rights->user->group_advance->write);
} }
// Define value to know what current user can do on properties of edited user // Define value to know what current user can do on properties of edited user
if ($id) if ($id)
@ -87,14 +89,14 @@ $form = new Form($db);
/** /**
* Actions * Actions
*/ */
if ($_GET["subaction"] == 'addrights' && $canedituser) if ($subaction == 'addrights' && $canedituser)
{ {
$edituser = new User($db); $edituser = new User($db);
$edituser->fetch($id); $edituser->fetch($id);
$edituser->addrights($_GET["rights"]); $edituser->addrights($_GET["rights"]);
} }
if ($_GET["subaction"] == 'delrights' && $canedituser) if ($subaction == 'delrights' && $canedituser)
{ {
$edituser = new User($db); $edituser = new User($db);
$edituser->fetch($id); $edituser->fetch($id);
@ -116,8 +118,6 @@ if ($action == 'confirm_enable' && $confirm == "yes" && $candisableuser)
{ {
if ($id <> $user->id) if ($id <> $user->id)
{ {
$message='';
$edituser = new User($db); $edituser = new User($db);
$edituser->fetch($id); $edituser->fetch($id);
@ -162,7 +162,6 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $candisableuser)
// Action ajout user // Action ajout user
if ($action == 'add' && $canadduser) if ($action == 'add' && $canadduser)
{ {
$message="";
if (! $_POST["nom"]) if (! $_POST["nom"])
{ {
$message='<div class="error">'.$langs->trans("NameNotDefined").'</div>'; $message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
@ -286,8 +285,6 @@ if ($action == 'update' && ! $_POST["cancel"])
if ($caneditfield) // Case we can edit all field if ($caneditfield) // Case we can edit all field
{ {
$message="";
if (! $_POST["nom"]) if (! $_POST["nom"])
{ {
$message='<div class="error">'.$langs->trans("NameNotDefined").'</div>'; $message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
@ -539,7 +536,9 @@ if (($action == 'create') || ($action == 'adduserldap'))
print "<br>"; print "<br>";
print "<br>"; print "<br>";
if ($conf->ldap->enabled && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') dol_htmloutput_errors($message);
if (! empty($conf->ldap->enabled) && (isset($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr'))
{ {
/* /*
* Affiche formulaire d'ajout d'un compte depuis LDAP * Affiche formulaire d'ajout d'un compte depuis LDAP
@ -589,40 +588,35 @@ if (($action == 'create') || ($action == 'adduserldap'))
{ {
$message='<div class="error">'.$ldap->error.'</div>'; $message='<div class="error">'.$ldap->error.'</div>';
} }
}
dol_htmloutput_errors($message);
if ($conf->ldap->enabled && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')
{
// Si la liste des users est rempli, on affiche la liste deroulante // Si la liste des users est rempli, on affiche la liste deroulante
if (is_array($liste)) if (is_array($liste))
{ {
print "\n\n<!-- Form liste LDAP debut -->\n"; print "\n\n<!-- Form liste LDAP debut -->\n";
print '<form name="add_user_ldap" action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form name="add_user_ldap" action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table width="100%" class="border"><tr>'; print '<table width="100%" class="border"><tr>';
print '<td width="160">'; print '<td width="160">';
print $langs->trans("LDAPUsers"); print $langs->trans("LDAPUsers");
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print '<input type="hidden" name="action" value="adduserldap">'; print '<input type="hidden" name="action" value="adduserldap">';
print $form->selectarray('users', $liste, '', 1); print $form->selectarray('users', $liste, '', 1);
print '</td><td align="center">'; print '</td><td align="center">';
print '<input type="submit" class="button" value="'.$langs->trans('Get').'">'; print '<input type="submit" class="button" value="'.$langs->trans('Get').'">';
print '</td></tr></table>'; print '</td></tr></table>';
print '</form>'; print '</form>';
print "\n<!-- Form liste LDAP fin -->\n\n"; print "\n<!-- Form liste LDAP fin -->\n\n";
print '<br>'; print '<br>';
} }
} }
print '<form action="fiche.php" method="post" name="createuser">'; print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST" name="createuser">';
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">';
if ($ldap_sid) print '<input type="hidden" name="ldap_sid" value="'.$ldap_sid.'">'; if (! empty($ldap_sid)) print '<input type="hidden" name="ldap_sid" value="'.$ldap_sid.'">';
print '<input type="hidden" name="entity" value="'.$conf->entity.'">'; print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
@ -632,52 +626,52 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Nom // Nom
print '<td valign="top" width="160"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>'; print '<td valign="top" width="160"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>';
print '<td>'; print '<td>';
if ($ldap_nom) if (! empty($ldap_nom))
{ {
print '<input type="hidden" name="nom" value="'.$ldap_nom.'">'; print '<input type="hidden" name="nom" value="'.$ldap_nom.'">';
print $ldap_nom; print $ldap_nom;
} }
else else
{ {
print '<input size="30" type="text" name="nom" value="'.$_POST["nom"].'">'; print '<input size="30" type="text" name="nom" value="'.GETPOST('nom').'">';
} }
print '</td></tr>'; print '</td></tr>';
// Prenom // Prenom
print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>'; print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>';
print '<td>'; print '<td>';
if ($ldap_prenom) if (! empty($ldap_prenom))
{ {
print '<input type="hidden" name="prenom" value="'.$ldap_prenom.'">'; print '<input type="hidden" name="prenom" value="'.$ldap_prenom.'">';
print $ldap_prenom; print $ldap_prenom;
} }
else else
{ {
print '<input size="30" type="text" name="prenom" value="'.$_POST["prenom"].'">'; print '<input size="30" type="text" name="prenom" value="'.GETPOST('prenom').'">';
} }
print '</td></tr>'; print '</td></tr>';
// Login // Login
print '<tr><td valign="top"><span class="fieldrequired">'.$langs->trans("Login").'</span></td>'; print '<tr><td valign="top"><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
print '<td>'; print '<td>';
if ($ldap_login) if (! empty($ldap_login))
{ {
print '<input type="hidden" name="login" value="'.$ldap_login.'">'; print '<input type="hidden" name="login" value="'.$ldap_login.'">';
print $ldap_login; print $ldap_login;
} }
elseif ($ldap_loginsmb) elseif (! empty($ldap_loginsmb))
{ {
print '<input type="hidden" name="login" value="'.$ldap_loginsmb.'">'; print '<input type="hidden" name="login" value="'.$ldap_loginsmb.'">';
print $ldap_loginsmb; print $ldap_loginsmb;
} }
else else
{ {
print '<input size="20" maxsize="24" type="text" name="login" value="'.$_POST["login"].'">'; print '<input size="20" maxsize="24" type="text" name="login" value="'.GETPOST('login').'">';
} }
print '</td></tr>'; print '</td></tr>';
$generated_password=''; $generated_password='';
if (! $ldap_sid) // ldap_sid is for activedirectory if (empty($ldap_sid)) // ldap_sid is for activedirectory
{ {
require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php");
$generated_password=getRandomPassword(''); $generated_password=getRandomPassword('');
@ -687,13 +681,13 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Mot de passe // Mot de passe
print '<tr><td valign="top">'.$langs->trans("Password").'</td>'; print '<tr><td valign="top">'.$langs->trans("Password").'</td>';
print '<td>'; print '<td>';
if ($ldap_sid) if (! empty($ldap_sid))
{ {
print 'Mot de passe du domaine'; print 'Mot de passe du domaine';
} }
else else
{ {
if ($ldap_pass) if (! empty($ldap_pass))
{ {
print '<input type="hidden" name="password" value="'.$ldap_pass.'">'; print '<input type="hidden" name="password" value="'.$ldap_pass.'">';
print preg_replace('/./i','*',$ldap_pass); print preg_replace('/./i','*',$ldap_pass);
@ -707,15 +701,15 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '</td></tr>'; print '</td></tr>';
// Administrateur // Administrateur
if ($user->admin) if (! empty($user->admin))
{ {
print '<tr><td valign="top">'.$langs->trans("Administrator").'</td>'; print '<tr><td valign="top">'.$langs->trans("Administrator").'</td>';
print '<td>'; print '<td>';
print $form->selectyesno('admin',$_POST["admin"],1); print $form->selectyesno('admin',GETPOST('admin'),1);
if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode)) if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
{ {
if ($conf->use_javascript_ajax) if (! empty($conf->use_javascript_ajax))
{ {
print '<script type="text/javascript"> print '<script type="text/javascript">
$(function() { $(function() {
@ -774,63 +768,63 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Tel // Tel
print '<tr><td valign="top">'.$langs->trans("PhonePro").'</td>'; print '<tr><td valign="top">'.$langs->trans("PhonePro").'</td>';
print '<td>'; print '<td>';
if ($ldap_phone) if (! empty($ldap_phone))
{ {
print '<input type="hidden" name="office_phone" value="'.$ldap_phone.'">'; print '<input type="hidden" name="office_phone" value="'.$ldap_phone.'">';
print $ldap_phone; print $ldap_phone;
} }
else else
{ {
print '<input size="20" type="text" name="office_phone" value="'.$_POST["office_phone"].'">'; print '<input size="20" type="text" name="office_phone" value="'.GETPOST('office_phone').'">';
} }
print '</td></tr>'; print '</td></tr>';
// Tel portable // Tel portable
print '<tr><td valign="top">'.$langs->trans("PhoneMobile").'</td>'; print '<tr><td valign="top">'.$langs->trans("PhoneMobile").'</td>';
print '<td>'; print '<td>';
if ($ldap_mobile) if (! empty($ldap_mobile))
{ {
print '<input type="hidden" name="user_mobile" value="'.$ldap_mobile.'">'; print '<input type="hidden" name="user_mobile" value="'.$ldap_mobile.'">';
print $ldap_mobile; print $ldap_mobile;
} }
else else
{ {
print '<input size="20" type="text" name="user_mobile" value="'.$_POST["user_mobile"].'">'; print '<input size="20" type="text" name="user_mobile" value="'.GETPOST('user_mobile').'">';
} }
print '</td></tr>'; print '</td></tr>';
// Fax // Fax
print '<tr><td valign="top">'.$langs->trans("Fax").'</td>'; print '<tr><td valign="top">'.$langs->trans("Fax").'</td>';
print '<td>'; print '<td>';
if ($ldap_fax) if (! empty($ldap_fax))
{ {
print '<input type="hidden" name="office_fax" value="'.$ldap_fax.'">'; print '<input type="hidden" name="office_fax" value="'.$ldap_fax.'">';
print $ldap_fax; print $ldap_fax;
} }
else else
{ {
print '<input size="20" type="text" name="office_fax" value="'.$_POST["office_fax"].'">'; print '<input size="20" type="text" name="office_fax" value="'.GETPOST('office_fax').'">';
} }
print '</td></tr>'; print '</td></tr>';
// EMail // EMail
print '<tr><td valign="top"'.($conf->global->USER_MAIL_REQUIRED?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>'; print '<tr><td valign="top"'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
print '<td>'; print '<td>';
if ($ldap_mail) if (! empty($ldap_mail))
{ {
print '<input type="hidden" name="email" value="'.$ldap_mail.'">'; print '<input type="hidden" name="email" value="'.$ldap_mail.'">';
print $ldap_mail; print $ldap_mail;
} }
else else
{ {
print '<input size="40" type="text" name="email" value="'.$_POST["email"].'">'; print '<input size="40" type="text" name="email" value="'.GETPOST('email').'">';
} }
print '</td></tr>'; print '</td></tr>';
// Signature // Signature
print '<tr><td valign="top">'.$langs->trans("Signature").'</td>'; print '<tr><td valign="top">'.$langs->trans("Signature").'</td>';
print '<td>'; print '<td>';
print '<textarea rows="'.ROWS_5.'" cols="90" name="signature">'.$_POST["signature"].'</textarea>'; print '<textarea rows="'.ROWS_5.'" cols="90" name="signature">'.GETPOST('signature').'</textarea>';
print '</td></tr>'; print '</td></tr>';
// Note // Note
@ -845,14 +839,16 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Autres caracteristiques issus des autres modules // Autres caracteristiques issus des autres modules
// Module Webcalendar // Module Webcalendar
if ($conf->webcalendar->enabled) // TODO external module
if (! empty($conf->webcalendar->enabled))
{ {
print "<tr>".'<td valign="top">'.$langs->trans("LoginWebcal").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("LoginWebcal").'</td>';
print '<td><input size="30" type="text" name="webcal_login" value="'.$_POST["webcal_login"].'"></td></tr>'; print '<td><input size="30" type="text" name="webcal_login" value="'.$_POST["webcal_login"].'"></td></tr>';
} }
// Module Phenix // Module Phenix
if ($conf->phenix->enabled) // TODO external module
if (! empty($conf->phenix->enabled))
{ {
print "<tr>".'<td valign="top">'.$langs->trans("LoginPenix").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("LoginPenix").'</td>';
print '<td><input size="30" type="text" name="phenix_login" value="'.$_POST["phenix_login"].'"></td></tr>'; print '<td><input size="30" type="text" name="phenix_login" value="'.$_POST["phenix_login"].'"></td></tr>';
@ -880,7 +876,7 @@ else
// Connexion ldap // Connexion ldap
// pour recuperer passDoNotExpire et userChangePassNextLogon // pour recuperer passDoNotExpire et userChangePassNextLogon
if ($conf->ldap->enabled && $fuser->ldap_sid) if (! empty($conf->ldap->enabled) && ! empty($fuser->ldap_sid))
{ {
$ldap = new Ldap(); $ldap = new Ldap();
$result=$ldap->connect_bind(); $result=$ldap->connect_bind();
@ -991,10 +987,10 @@ else
print '</tr>'."\n"; print '</tr>'."\n";
$rowspan=14; $rowspan=14;
if ($conf->societe->enabled) $rowspan++; if (! empty($conf->societe->enabled)) $rowspan++;
if ($conf->adherent->enabled) $rowspan++; if (! empty($conf->adherent->enabled)) $rowspan++;
if ($conf->webcalendar->enabled) $rowspan++; if (! empty($conf->webcalendar->enabled)) $rowspan++; // TODO external module
if ($conf->phenix->enabled) $rowspan+=2; if (! empty($conf->phenix->enabled)) $rowspan+=2; // TODO external module
// Lastname // Lastname
print '<tr><td valign="top">'.$langs->trans("Lastname").'</td>'; print '<tr><td valign="top">'.$langs->trans("Lastname").'</td>';
@ -1014,7 +1010,7 @@ else
// Login // Login
print '<tr><td valign="top">'.$langs->trans("Login").'</td>'; print '<tr><td valign="top">'.$langs->trans("Login").'</td>';
if ($fuser->ldap_sid && $fuser->statut==0) if (! empty($fuser->ldap_sid) && $fuser->statut==0)
{ {
print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>'; print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
} }
@ -1026,7 +1022,7 @@ else
// Password // Password
print '<tr><td valign="top">'.$langs->trans("Password").'</td>'; print '<tr><td valign="top">'.$langs->trans("Password").'</td>';
if ($fuser->ldap_sid) if (! empty($fuser->ldap_sid))
{ {
if ($passDoNotExpire) if ($passDoNotExpire)
{ {
@ -1147,7 +1143,7 @@ else
print "</tr>\n"; print "</tr>\n";
if (preg_match('/myopenid/',$conf->authmode)) if (isset($conf->authmode) && preg_match('/myopenid/',$conf->authmode))
{ {
print '<tr><td valign="top">'.$langs->trans("url_openid").'</td>'; print '<tr><td valign="top">'.$langs->trans("url_openid").'</td>';
print '<td>'.$fuser->openid.'</td>'; print '<td>'.$fuser->openid.'</td>';
@ -1156,7 +1152,8 @@ else
// Autres caracteristiques issus des autres modules // Autres caracteristiques issus des autres modules
// Module Webcalendar // Module Webcalendar
if ($conf->webcalendar->enabled) // TODO external module
if (! empty($conf->webcalendar->enabled))
{ {
$langs->load("other"); $langs->load("other");
print '<tr><td valign="top">'.$langs->trans("LoginWebcal").'</td>'; print '<tr><td valign="top">'.$langs->trans("LoginWebcal").'</td>';
@ -1165,7 +1162,8 @@ else
} }
// Module Phenix // Module Phenix
if ($conf->phenix->enabled) // TODO external module
if (! empty($conf->phenix->enabled))
{ {
$langs->load("other"); $langs->load("other");
print '<tr><td valign="top">'.$langs->trans("LoginPhenix").'</td>'; print '<tr><td valign="top">'.$langs->trans("LoginPhenix").'</td>';
@ -1177,11 +1175,11 @@ else
} }
// Company / Contact // Company / Contact
if ($conf->societe->enabled) if (! empty($conf->societe->enabled))
{ {
print '<tr><td valign="top">'.$langs->trans("LinkToCompanyContact").'</td>'; print '<tr><td valign="top">'.$langs->trans("LinkToCompanyContact").'</td>';
print '<td>'; print '<td>';
if ($fuser->societe_id > 0) if (isset($fuser->societe_id) && $fuser->societe_id > 0)
{ {
$societe = new Societe($db); $societe = new Societe($db);
$societe->fetch($fuser->societe_id); $societe->fetch($fuser->societe_id);
@ -1191,7 +1189,7 @@ else
{ {
print $langs->trans("ThisUserIsNot"); print $langs->trans("ThisUserIsNot");
} }
if ($fuser->contact_id) if (! empty($fuser->contact_id))
{ {
$contact = new Contact($db); $contact = new Contact($db);
$contact->fetch($fuser->contact_id); $contact->fetch($fuser->contact_id);
@ -1204,7 +1202,7 @@ else
} }
// Module Adherent // Module Adherent
if ($conf->adherent->enabled) if (! empty($conf->adherent->enabled))
{ {
$langs->load("members"); $langs->load("members");
print '<tr><td valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>'; print '<tr><td valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
@ -1315,15 +1313,15 @@ else
$usergroup=new UserGroup($db); $usergroup=new UserGroup($db);
$groupslist = $usergroup->listGroupsForUser($fuser->id); $groupslist = $usergroup->listGroupsForUser($fuser->id);
if (! empty($groupslist)) if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
{ {
if( ! ($conf->multicompany->enabled && $conf->multicompany->transverse_mode)) if (! empty($groupslist))
{ {
foreach($groupslist as $groupforuser) foreach($groupslist as $groupforuser)
{ {
$exclude[]=$groupforuser->id; $exclude[]=$groupforuser->id;
} }
} }
} }
if ($caneditgroup) if ($caneditgroup)
@ -1402,15 +1400,19 @@ else
{ {
$mc->getInfo($group_entity); $mc->getInfo($group_entity);
print ($nb > 0 ? ', ' : '').$mc->label; print ($nb > 0 ? ', ' : '').$mc->label;
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$fuser->id.'&amp;action=removegroup&amp;group='.$group->id.'&amp;entity='.$group_entity.'">';
print img_delete($langs->trans("RemoveFromGroup"));
print '</a>';
$nb++; $nb++;
} }
} }
} }
print '<td align="right">'; print '<td align="right">';
if ($caneditgroup) if ($caneditgroup && empty($conf->multicompany->transverse_mode))
{ {
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$fuser->id.'&amp;action=removegroup&amp;group='.$group->id.'&amp;entity='.$group->usergroup_entity.'">'; print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$fuser->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
print img_delete($langs->trans("RemoveFromGroup")); print img_delete($langs->trans("RemoveFromGroup"));
print '</a>';
} }
else else
{ {
@ -1429,14 +1431,12 @@ else
} }
} }
/* /*
* Fiche en mode edition * Fiche en mode edition
*/ */
if ($action == 'edit' && ($canedituser || ($user->id == $fuser->id))) if ($action == 'edit' && ($canedituser || ($user->id == $fuser->id)))
{ {
print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$fuser->id.'" method="POST" name="updateuser" enctype="multipart/form-data">'; print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$fuser->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
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">';
@ -1445,10 +1445,10 @@ else
$rowspan=12; $rowspan=12;
if ($conf->societe->enabled) $rowspan++; if (! empty($conf->societe->enabled)) $rowspan++;
if ($conf->adherent->enabled) $rowspan++; if (! empty($conf->adherent->enabled)) $rowspan++;
if ($conf->webcalendar->enabled) $rowspan++; if (! empty($conf->webcalendar->enabled)) $rowspan++; // TODO external module
if ($conf->phenix->enabled) $rowspan+=2; if (! empty($conf->phenix->enabled)) $rowspan+=2; // TODO external module
print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
@ -1650,7 +1650,7 @@ else
// Tel pro // Tel pro
print "<tr>".'<td valign="top">'.$langs->trans("PhonePro").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("PhonePro").'</td>';
print '<td>'; print '<td>';
if ($caneditfield && !$fuser->ldap_sid) if ($caneditfield && empty($fuser->ldap_sid))
{ {
print '<input size="20" type="text" name="office_phone" class="flat" value="'.$fuser->office_phone.'">'; print '<input size="20" type="text" name="office_phone" class="flat" value="'.$fuser->office_phone.'">';
} }
@ -1664,7 +1664,7 @@ else
// Tel mobile // Tel mobile
print "<tr>".'<td valign="top">'.$langs->trans("PhoneMobile").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("PhoneMobile").'</td>';
print '<td>'; print '<td>';
if ($caneditfield && !$fuser->ldap_sid) if ($caneditfield && empty($fuser->ldap_sid))
{ {
print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$fuser->user_mobile.'">'; print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$fuser->user_mobile.'">';
} }
@ -1678,7 +1678,7 @@ else
// Fax // Fax
print "<tr>".'<td valign="top">'.$langs->trans("Fax").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("Fax").'</td>';
print '<td>'; print '<td>';
if ($caneditfield && !$fuser->ldap_sid) if ($caneditfield && empty($fuser->ldap_sid))
{ {
print '<input size="20" type="text" name="office_fax" class="flat" value="'.$fuser->office_fax.'">'; print '<input size="20" type="text" name="office_fax" class="flat" value="'.$fuser->office_fax.'">';
} }
@ -1690,9 +1690,9 @@ else
print '</td></tr>'; print '</td></tr>';
// EMail // EMail
print "<tr>".'<td valign="top"'.($conf->global->USER_MAIL_REQUIRED?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>'; print "<tr>".'<td valign="top"'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
print '<td>'; print '<td>';
if ($caneditfield && !$fuser->ldap_sid) if ($caneditfield && empty($fuser->ldap_sid))
{ {
print '<input size="40" type="text" name="email" class="flat" value="'.$fuser->email.'">'; print '<input size="40" type="text" name="email" class="flat" value="'.$fuser->email.'">';
} }
@ -1710,7 +1710,7 @@ else
print '</td></tr>'; print '</td></tr>';
// openid // openid
if (preg_match('/myopenid/',$conf->authmode)) if (isset($conf->authmode) && preg_match('/myopenid/',$conf->authmode))
{ {
print "<tr>".'<td valign="top">'.$langs->trans("url_openid").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("url_openid").'</td>';
print '<td>'; print '<td>';
@ -1735,7 +1735,8 @@ else
// Autres caracteristiques issus des autres modules // Autres caracteristiques issus des autres modules
// Module Webcalendar // Module Webcalendar
if ($conf->webcalendar->enabled) // TODO external module
if (! empty($conf->webcalendar->enabled))
{ {
$langs->load("other"); $langs->load("other");
print "<tr>".'<td valign="top">'.$langs->trans("LoginWebcal").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("LoginWebcal").'</td>';
@ -1746,7 +1747,8 @@ else
} }
// Module Phenix // Module Phenix
if ($conf->phenix->enabled) // TODO external module
if (! empty($conf->phenix->enabled))
{ {
$langs->load("other"); $langs->load("other");
print "<tr>".'<td valign="top">'.$langs->trans("LoginPhenix").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("LoginPhenix").'</td>';
@ -1762,7 +1764,7 @@ else
} }
// Company / Contact // Company / Contact
if ($conf->societe->enabled) if (! empty($conf->societe->enabled))
{ {
print '<tr><td width="25%" valign="top">'.$langs->trans("LinkToCompanyContact").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("LinkToCompanyContact").'</td>';
print '<td>'; print '<td>';
@ -1787,7 +1789,7 @@ else
} }
// Module Adherent // Module Adherent
if ($conf->adherent->enabled) if (! empty($conf->adherent->enabled))
{ {
$langs->load("members"); $langs->load("members");
print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
@ -1820,12 +1822,11 @@ else
print '</div>'; print '</div>';
} }
$ldap->close; if (! empty($conf->ldap->enabled) && ! empty($fuser->ldap_sid)) $ldap->close;
} }
} }
$db->close();
llxFooter(); llxFooter();
$db->close();
?> ?>

36
htdocs/user/group/fiche.php
View File

@ -47,6 +47,7 @@ $id=GETPOST('id', 'int');
$action=GETPOST('action', 'alpha'); $action=GETPOST('action', 'alpha');
$confirm=GETPOST('confirm', 'alpha'); $confirm=GETPOST('confirm', 'alpha');
$userid=GETPOST('user', 'int'); $userid=GETPOST('user', 'int');
$message='';
// Security check // Security check
$result = restrictedArea($user, 'user', $id, 'usergroup&usergroup', 'user'); $result = restrictedArea($user, 'user', $id, 'usergroup&usergroup', 'user');
@ -85,7 +86,6 @@ if ($action == 'add')
{ {
if ($caneditperms) if ($caneditperms)
{ {
$message="";
if (! $_POST["nom"]) if (! $_POST["nom"])
{ {
$message='<div class="error">'.$langs->trans("NameNotDefined").'</div>'; $message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
@ -140,8 +140,8 @@ if ($action == 'adduser' || $action =='removeuser')
$edituser = new User($db); $edituser = new User($db);
$edituser->fetch($userid); $edituser->fetch($userid);
if ($action == 'adduser') $result=$edituser->SetInGroup($object->id,($conf->multicompany->transverse_mode?GETPOST("entity"):$object->entity)); if ($action == 'adduser') $result=$edituser->SetInGroup($object->id,(! empty($conf->multicompany->transverse_mode)?GETPOST('entity','int'):$object->entity));
if ($action == 'removeuser') $result=$edituser->RemoveFromGroup($object->id,($conf->multicompany->transverse_mode?GETPOST("entity"):$object->entity)); if ($action == 'removeuser') $result=$edituser->RemoveFromGroup($object->id,(! empty($conf->multicompany->transverse_mode)?GETPOST('entity','int'):$object->entity));
if ($result > 0) if ($result > 0)
{ {
@ -166,8 +166,6 @@ if ($action == 'update')
{ {
if ($caneditperms) if ($caneditperms)
{ {
$message="";
$db->begin(); $db->begin();
$object->fetch($id); $object->fetch($id);
@ -177,7 +175,7 @@ if ($action == 'update')
$object->nom = trim($_POST["group"]); $object->nom = trim($_POST["group"]);
$object->note = dol_htmlcleanlastbr($_POST["note"]); $object->note = dol_htmlcleanlastbr($_POST["note"]);
if ($conf->multicompany->enabled && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0; if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0;
else $object->entity = $_POST["entity"]; else $object->entity = $_POST["entity"];
$ret=$object->update(); $ret=$object->update();
@ -352,15 +350,15 @@ else
// On selectionne les users qui ne sont pas deja dans le groupe // On selectionne les users qui ne sont pas deja dans le groupe
$exclude = array(); $exclude = array();
if (! empty($object->members)) if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
{ {
if (! ($conf->multicompany->enabled && $conf->multicompany->transverse_mode)) if (! empty($object->members))
{ {
foreach($object->members as $useringroup) foreach($object->members as $useringroup)
{ {
$exclude[]=$useringroup->id; $exclude[]=$useringroup->id;
} }
} }
} }
if ($caneditperms) if ($caneditperms)
@ -428,7 +426,7 @@ else
print '</td>'; print '</td>';
print '<td>'.$useringroup->lastname.'</td>'; print '<td>'.$useringroup->lastname.'</td>';
print '<td>'.$useringroup->firstname.'</td>'; print '<td>'.$useringroup->firstname.'</td>';
if (! empty($conf->multicompany->enabled) && $conf->entity == 1) if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
{ {
print '<td class="valeur">'; print '<td class="valeur">';
if (! empty($useringroup->usergroup_entity)) if (! empty($useringroup->usergroup_entity))
@ -438,6 +436,9 @@ else
{ {
$mc->getInfo($group_entity); $mc->getInfo($group_entity);
print ($nb > 0 ? ', ' : '').$mc->label; print ($nb > 0 ? ', ' : '').$mc->label;
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'&amp;entity='.$group_entity.'">';
print img_delete($langs->trans("RemoveFromGroup"));
print '</a>';
$nb++; $nb++;
} }
} }
@ -445,10 +446,11 @@ else
} }
print '<td align="center">'.$useringroup->getLibStatut(3).'</td>'; print '<td align="center">'.$useringroup->getLibStatut(3).'</td>';
print '<td align="right">'; print '<td align="right">';
if ($user->admin) if (! empty($user->admin) && empty($conf->multicompany->enabled))
{ {
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'&amp;entity='.$useringroup->usergroup_entity.'">'; print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'">';
print img_delete($langs->trans("RemoveFromGroup")); print img_delete($langs->trans("RemoveFromGroup"));
print '</a>';
} }
else else
{ {

8
htdocs/user/group/index.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-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) 2011 Herve Prot <herve.prot@symeos.com> * Copyright (C) 2011 Herve Prot <herve.prot@symeos.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
@ -34,6 +34,7 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
$langs->load("users"); $langs->load("users");
$sall=GETPOST("sall"); $sall=GETPOST("sall");
$search_group=GETPOST('search_group');
$sortfield = GETPOST("sortfield",'alpha'); $sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha'); $sortorder = GETPOST("sortorder",'alpha');
@ -66,7 +67,7 @@ else
{ {
$sql.= " WHERE g.entity IN (0,".$conf->entity.")"; $sql.= " WHERE g.entity IN (0,".$conf->entity.")";
} }
if ($_POST["search_group"]) if ($search_group)
{ {
$sql .= " AND (g.nom LIKE '%".$db->escape($_POST["search_group"])."%' OR g.note LIKE '%".$db->escape($_POST["search_group"])."%')"; $sql .= " AND (g.nom LIKE '%".$db->escape($_POST["search_group"])."%' OR g.note LIKE '%".$db->escape($_POST["search_group"])."%')";
} }
@ -124,8 +125,7 @@ else
dol_print_error($db); dol_print_error($db);
} }
$db->close();
llxFooter(); llxFooter();
$db->close();
?> ?>

2
htdocs/user/group/perms.php
View File

@ -258,7 +258,7 @@ if ($id)
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
// Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore // Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore
if (! $modules[$obj->module]) if (empty($modules[$obj->module]))
{ {
$i++; $i++;
continue; continue;

8
htdocs/user/home.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2005-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>
* *
* 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
@ -99,7 +99,7 @@ $sql = "SELECT u.rowid, u.name, u.firstname, u.admin, u.login, u.fk_societe, u.d
$sql.= " s.nom, s.canvas"; $sql.= " s.nom, s.canvas";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid";
if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity))) if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
{ {
$sql.= " WHERE u.entity IS NOT NULL"; $sql.= " WHERE u.entity IS NOT NULL";
} }
@ -127,7 +127,7 @@ if ($resql)
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->firstname.' '.$obj->name.'</a>'; print '<td><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->firstname.' '.$obj->name.'</a>';
if ($conf->global->MAIN_MODULE_MULTICOMPANY && $obj->admin && ! $obj->entity) if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity)
{ {
print img_picto($langs->trans("SuperAdministrator"),'redstar'); print img_picto($langs->trans("SuperAdministrator"),'redstar');
} }
@ -168,7 +168,7 @@ if ($resql)
print '</td>'; print '</td>';
print '<td align="right">'.dol_print_date($db->jdate($obj->datec),'dayhour').'</td>'; print '<td align="right">'.dol_print_date($db->jdate($obj->datec),'dayhour').'</td>';
print '<td align="right">'; print '<td align="right">';
$fuserstatic->id=$obj->id; $fuserstatic->id=$obj->rowid;
$fuserstatic->statut=$obj->statut; $fuserstatic->statut=$obj->statut;
print $fuserstatic->getLibStatut(3); print $fuserstatic->getLibStatut(3);
print '</td>'; print '</td>';

9
htdocs/user/index.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) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-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>
* *
* 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
@ -37,6 +37,7 @@ $socid=0;
if ($user->societe_id > 0) $socid = $user->societe_id; if ($user->societe_id > 0) $socid = $user->societe_id;
$sall=GETPOST('sall','alpha'); $sall=GETPOST('sall','alpha');
$search_user=GETPOST('search_user','alpha');
$sortfield = GETPOST("sortfield",'alpha'); $sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha'); $sortorder = GETPOST("sortorder",'alpha');
@ -69,7 +70,7 @@ $sql.= " u.ldap_sid, u.statut, u.entity,";
$sql.= " s.nom, s.canvas"; $sql.= " s.nom, s.canvas";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid";
if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity))) if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->multicompany->transverse_mode) || (! empty($user->admin) && empty($user->entity))))
{ {
$sql.= " WHERE u.entity IS NOT NULL"; $sql.= " WHERE u.entity IS NOT NULL";
} }
@ -78,9 +79,9 @@ else
$sql.= " WHERE u.entity IN (0,".$conf->entity.")"; $sql.= " WHERE u.entity IN (0,".$conf->entity.")";
} }
if (!empty($socid)) $sql.= " AND u.fk_societe = ".$socid; if (!empty($socid)) $sql.= " AND u.fk_societe = ".$socid;
if ($_POST["search_user"]) if ($search_user)
{ {
$sql.= " AND (u.login like '%".$_POST["search_user"]."%' OR u.name like '%".$_POST["search_user"]."%' OR u.firstname like '%".$_POST["search_user"]."%')"; $sql.= " AND (u.login like '%".$search_user."%' OR u.name like '%".$search_user."%' OR u.firstname like '%".$search_user."%')";
} }
if ($sall) $sql.= " AND (u.login like '%".$db->escape($sall)."%' OR u.name like '%".$db->escape($sall)."%' OR u.firstname like '%".$db->escape($sall)."%' OR u.email like '%".$db->escape($sall)."%' OR u.note like '%".$db->escape($sall)."%')"; if ($sall) $sql.= " AND (u.login like '%".$db->escape($sall)."%' OR u.name like '%".$db->escape($sall)."%' OR u.firstname like '%".$db->escape($sall)."%' OR u.email like '%".$db->escape($sall)."%' OR u.note like '%".$db->escape($sall)."%')";
$sql.=$db->order($sortfield,$sortorder); $sql.=$db->order($sortfield,$sortorder);

30
htdocs/user/param_ihm.php
View File

@ -36,7 +36,7 @@ $langs->load("languages");
$canreaduser=($user->admin || $user->rights->user->user->lire); $canreaduser=($user->admin || $user->rights->user->user->lire);
$id = GETPOST('id','int'); $id = GETPOST('id','int');
$action = GETPOST('action'); $action = GETPOST('action','alpha');
if ($id) if ($id)
{ {
@ -143,7 +143,7 @@ print "</tr>\n";
print '</table><br>'; print '</table><br>';
if ($_GET["action"] == 'edit') if ($action == 'edit')
{ {
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'].'">';
@ -164,21 +164,21 @@ if ($_GET["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" '.($fuser->conf->MAIN_LANG_DEFAULT?" checked":""); 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 ! 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>';
print $formadmin->select_language($fuser->conf->MAIN_LANG_DEFAULT,'main_lang_default',1); print $formadmin->select_language((! empty($fuser->conf->MAIN_LANG_DEFAULT)?$fuser->conf->MAIN_LANG_DEFAULT:''),'main_lang_default',1);
print '</td></tr>'; print '</td></tr>';
// Taille max des listes // Taille max des listes
$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" '.($fuser->conf->MAIN_SIZE_LISTE_LIMIT?" checked":""); 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 ! 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="' . $fuser->conf->SIZE_LISTE_LIMIT . '"></td></tr>'; 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 '</table><br>'; print '</table><br>';
@ -207,20 +207,20 @@ else
print '<td>'; print '<td>';
$s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT); $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
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 (isset($conf->global->MAIN_LANG_DEFAULT) && $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].' type="checkbox" disabled '.($fuser->conf->MAIN_LANG_DEFAULT?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>'; print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.(! empty($fuser->conf->MAIN_LANG_DEFAULT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
print '<td>'; print '<td>';
$s=picto_from_langcode($fuser->conf->MAIN_LANG_DEFAULT); $s=(isset($fuser->conf->MAIN_LANG_DEFAULT) ? picto_from_langcode($fuser->conf->MAIN_LANG_DEFAULT) : '');
print ($s?$s.' ':''); print ($s?$s.' ':'');
print ($fuser->conf->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):($fuser->conf->MAIN_LANG_DEFAULT?$langs->trans("Language_".$fuser->conf->MAIN_LANG_DEFAULT):'')); print (isset($fuser->conf->MAIN_LANG_DEFAULT) && $fuser->conf->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):(! empty($fuser->conf->MAIN_LANG_DEFAULT)?$langs->trans("Language_".$fuser->conf->MAIN_LANG_DEFAULT):''));
print '</td></tr>'; print '</td></tr>';
$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>'.(! empty($conf->global->MAIN_SIZE_LISTE_LIMIT)?$conf->global->MAIN_SIZE_LISTE_LIMIT:'&nbsp;').'</td>';
print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.($fuser->conf->MAIN_SIZE_LISTE_LIMIT?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>'; print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.(! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
print '<td>' . $fuser->conf->MAIN_SIZE_LISTE_LIMIT . '</td></tr>'; print '<td>' . (! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?$fuser->conf->MAIN_SIZE_LISTE_LIMIT:'&nbsp;') . '</td></tr>';
print '</table><br>'; print '</table><br>';
@ -237,7 +237,7 @@ else
} }
else else
{ {
if ($user->id == $fuser->id || $user->admin) // Si utilisateur edite = utilisateur courant (pas besoin de droits particulier car il s'agit d'une page de modif d'output et non de données) ou si admin if ($user->id == $fuser->id || ! empty($user->admin)) // Si utilisateur edite = utilisateur courant (pas besoin de droits particulier car il s'agit d'une page de modif d'output et non de données) ou si admin
{ {
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$fuser->id.'">'.$langs->trans("Modify").'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$fuser->id.'">'.$langs->trans("Modify").'</a>';
} }
@ -251,7 +251,7 @@ else
} }
$db->close();
llxFooter(); llxFooter();
$db->close();
?> ?>

9
htdocs/user/perms.php
View File

@ -52,7 +52,7 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
// Security check // Security check
$socid=0; $socid=0;
if ($user->societe_id > 0) $socid = $user->societe_id; if (isset($user->societe_id) && $user->societe_id > 0) $socid = $user->societe_id;
$feature2 = (($socid && $user->rights->user->self->creer)?'':'user'); $feature2 = (($socid && $user->rights->user->self->creer)?'':'user');
if ($user->id == $id && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->user->self_advance->readperms)) // A user can always read its own card if not advanced perms enabled, or if he has advanced perms if ($user->id == $id && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->user->self_advance->readperms)) // A user can always read its own card if not advanced perms enabled, or if he has advanced perms
{ {
@ -276,19 +276,20 @@ if ($result)
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $i = 0;
$var = True; $var = True;
$oldmod='';
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
// Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore // Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore
if (! $modules[$obj->module]) if (empty($modules[$obj->module]))
{ {
$i++; $i++;
continue; continue;
} }
if ($oldmod <> $obj->module) if (isset($obj->module) && ($oldmod <> $obj->module))
{ {
$oldmod = $obj->module; $oldmod = $obj->module;
$var = !$var; $var = !$var;
@ -297,7 +298,7 @@ if ($result)
$objMod=$modules[$obj->module]; $objMod=$modules[$obj->module];
$picto=($objMod->picto?$objMod->picto:'generic'); $picto=($objMod->picto?$objMod->picto:'generic');
if ($caneditperms && (! $objMod->rights_admin_allowed || ! $fuser->admin)) if ($caneditperms && (empty($objMod->rights_admin_allowed) || empty($fuser->admin)))
{ {
// On affiche ligne pour modifier droits // On affiche ligne pour modifier droits
print '<tr '. $bc[$var].'>'; print '<tr '. $bc[$var].'>';